Show More
@@ -119,3 +119,67 b' file is excluded from sparse checkout' | |||||
119 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
119 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
120 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
120 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | |
121 | [1] |
|
121 | [1] | |
|
122 | ||||
|
123 | $ cd .. | |||
|
124 | ||||
|
125 | Testing merging of a file which is renamed+modified on one side and modified on | |||
|
126 | another | |||
|
127 | ||||
|
128 | $ hg init mvtest | |||
|
129 | $ cd mvtest | |||
|
130 | $ echo "syntax: glob" >> .hgignore | |||
|
131 | $ echo "*.orig" >> .hgignore | |||
|
132 | $ hg ci -Aqm "added .hgignore" | |||
|
133 | $ for ch in a d; do echo foo > $ch; hg ci -Aqm "added "$ch; done; | |||
|
134 | $ cat >> .hg/hgrc <<EOF | |||
|
135 | > [alias] | |||
|
136 | > glog = log -GT "{rev}:{node|short} {desc}" | |||
|
137 | > [extensions] | |||
|
138 | > sparse = | |||
|
139 | > EOF | |||
|
140 | ||||
|
141 | $ hg glog | |||
|
142 | @ 2:f29feff37cfc added d | |||
|
143 | | | |||
|
144 | o 1:617125d27d6b added a | |||
|
145 | | | |||
|
146 | o 0:53f3774ed939 added .hgignore | |||
|
147 | ||||
|
148 | $ echo babar >> a | |||
|
149 | $ hg ci -m "added babar to a" | |||
|
150 | ||||
|
151 | $ hg up '.^' | |||
|
152 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
153 | $ hg mv a amove | |||
|
154 | $ hg ci -m "moved a to amove" | |||
|
155 | created new head | |||
|
156 | ||||
|
157 | $ hg up 3 | |||
|
158 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
159 | $ hg glog | |||
|
160 | o 4:5d1e85955f6d moved a to amove | |||
|
161 | | | |||
|
162 | | @ 3:a06e41a6c16c added babar to a | |||
|
163 | |/ | |||
|
164 | o 2:f29feff37cfc added d | |||
|
165 | | | |||
|
166 | o 1:617125d27d6b added a | |||
|
167 | | | |||
|
168 | o 0:53f3774ed939 added .hgignore | |||
|
169 | ||||
|
170 | $ hg debugsparse --exclude "a" | |||
|
171 | $ ls | |||
|
172 | d | |||
|
173 | ||||
|
174 | $ hg merge | |||
|
175 | abort: $ENOENT$: $TESTTMP/mvtest/a | |||
|
176 | [255] | |||
|
177 | ||||
|
178 | $ hg up -C 4 | |||
|
179 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
180 | ||||
|
181 | $ hg merge | |||
|
182 | merging amove and a to amove | |||
|
183 | abort: cannot add 'a' - it is outside the sparse checkout | |||
|
184 | (include file with `hg debugsparse --include <pattern>` or use `hg add -s <file>` to include file directory while adding) | |||
|
185 | [255] |
General Comments 0
You need to be logged in to leave comments.
Login now