Show More
@@ -318,7 +318,8 b' def mergecopies(repo, c1, c2, ca):' | |||||
318 | note += "!" |
|
318 | note += "!" | |
319 | if f in renamedelete2: |
|
319 | if f in renamedelete2: | |
320 | note += "%" |
|
320 | note += "%" | |
321 |
repo.ui.debug(" %s -> %s %s\n" % ( |
|
321 | repo.ui.debug(" src: '%s' -> dst: '%s' %s\n" % (fullcopy[f], f, | |
|
322 | note)) | |||
322 | del diverge2 |
|
323 | del diverge2 | |
323 |
|
324 | |||
324 | if not fullcopy: |
|
325 | if not fullcopy: | |
@@ -362,7 +363,8 b' def mergecopies(repo, c1, c2, ca):' | |||||
362 | return copy, movewithdir, diverge, renamedelete |
|
363 | return copy, movewithdir, diverge, renamedelete | |
363 |
|
364 | |||
364 | for d in dirmove: |
|
365 | for d in dirmove: | |
365 |
repo.ui.debug(" dir %s -> %s\n" % |
|
366 | repo.ui.debug(" discovered dir src: '%s' -> dst: '%s'\n" % | |
|
367 | (d, dirmove[d])) | |||
366 |
|
368 | |||
367 | # check unaccounted nonoverlapping files against directory moves |
|
369 | # check unaccounted nonoverlapping files against directory moves | |
368 | for f in u1 + u2: |
|
370 | for f in u1 + u2: | |
@@ -373,7 +375,8 b' def mergecopies(repo, c1, c2, ca):' | |||||
373 | df = dirmove[d] + f[len(d):] |
|
375 | df = dirmove[d] + f[len(d):] | |
374 | if df not in copy: |
|
376 | if df not in copy: | |
375 | movewithdir[f] = df |
|
377 | movewithdir[f] = df | |
376 |
repo.ui.debug(" file %s -> |
|
378 | repo.ui.debug((" pending file src: '%s' -> " | |
|
379 | "dst: '%s'\n") % (f, df)) | |||
377 | break |
|
380 | break | |
378 |
|
381 | |||
379 | return copy, movewithdir, diverge, renamedelete |
|
382 | return copy, movewithdir, diverge, renamedelete |
@@ -25,8 +25,8 b'' | |||||
25 | b |
|
25 | b | |
26 | c |
|
26 | c | |
27 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
27 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
28 |
c -> |
|
28 | src: 'a' -> dst: 'c' * | |
29 | b -> a * |
|
29 | src: 'a' -> dst: 'b' * | |
30 | checking for directory renames |
|
30 | checking for directory renames | |
31 | resolving manifests |
|
31 | resolving manifests | |
32 | overwrite: False, partial: False |
|
32 | overwrite: False, partial: False |
@@ -30,7 +30,7 b" we get conflicts that shouldn't be there" | |||||
30 | unmatched files in other: |
|
30 | unmatched files in other: | |
31 | bar |
|
31 | bar | |
32 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
32 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
33 | bar -> foo * |
|
33 | src: 'foo' -> dst: 'bar' * | |
34 | checking for directory renames |
|
34 | checking for directory renames | |
35 | resolving manifests |
|
35 | resolving manifests | |
36 | overwrite: False, partial: False |
|
36 | overwrite: False, partial: False |
@@ -131,7 +131,7 b' Graft out of order, skipping a merge and' | |||||
131 | unmatched files in local: |
|
131 | unmatched files in local: | |
132 | b |
|
132 | b | |
133 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
133 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
134 | b -> a * |
|
134 | src: 'a' -> dst: 'b' * | |
135 | checking for directory renames |
|
135 | checking for directory renames | |
136 | resolving manifests |
|
136 | resolving manifests | |
137 | overwrite: False, partial: False |
|
137 | overwrite: False, partial: False |
@@ -29,7 +29,7 b' http://mercurial.selenic.com/bts/issue67' | |||||
29 | unmatched files in other: |
|
29 | unmatched files in other: | |
30 | 1a |
|
30 | 1a | |
31 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
31 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
32 |
1 |
|
32 | src: '1' -> dst: '1a' | |
33 | checking for directory renames |
|
33 | checking for directory renames | |
34 | resolving manifests |
|
34 | resolving manifests | |
35 | overwrite: False, partial: False |
|
35 | overwrite: False, partial: False | |
@@ -60,7 +60,7 b' http://mercurial.selenic.com/bts/issue67' | |||||
60 | unmatched files in local: |
|
60 | unmatched files in local: | |
61 | 1a |
|
61 | 1a | |
62 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
62 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
63 |
|
|
63 | src: '1' -> dst: '1a' * | |
64 | checking for directory renames |
|
64 | checking for directory renames | |
65 | resolving manifests |
|
65 | resolving manifests | |
66 | overwrite: False, partial: False |
|
66 | overwrite: False, partial: False | |
@@ -83,7 +83,7 b' http://mercurial.selenic.com/bts/issue67' | |||||
83 | unmatched files in other: |
|
83 | unmatched files in other: | |
84 | 1a |
|
84 | 1a | |
85 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
85 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
86 |
1 |
|
86 | src: '1' -> dst: '1a' * | |
87 | checking for directory renames |
|
87 | checking for directory renames | |
88 | resolving manifests |
|
88 | resolving manifests | |
89 | overwrite: False, partial: False |
|
89 | overwrite: False, partial: False |
@@ -31,11 +31,11 b'' | |||||
31 | b/a |
|
31 | b/a | |
32 | b/b |
|
32 | b/b | |
33 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
33 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
34 |
|
|
34 | src: 'a/a' -> dst: 'b/a' | |
35 |
|
|
35 | src: 'a/b' -> dst: 'b/b' | |
36 | checking for directory renames |
|
36 | checking for directory renames | |
37 | dir a/ -> b/ |
|
37 | discovered dir src: 'a/' -> dst: 'b/' | |
38 | file a/c -> b/c |
|
38 | pending file src: 'a/c' -> dst: 'b/c' | |
39 | resolving manifests |
|
39 | resolving manifests | |
40 | overwrite: False, partial: False |
|
40 | overwrite: False, partial: False | |
41 | ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740 |
|
41 | ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740 | |
@@ -82,11 +82,11 b'' | |||||
82 | unmatched files in other: |
|
82 | unmatched files in other: | |
83 | a/c |
|
83 | a/c | |
84 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
84 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
85 |
|
|
85 | src: 'a/a' -> dst: 'b/a' | |
86 |
|
|
86 | src: 'a/b' -> dst: 'b/b' | |
87 | checking for directory renames |
|
87 | checking for directory renames | |
88 | dir a/ -> b/ |
|
88 | discovered dir src: 'a/' -> dst: 'b/' | |
89 | file a/c -> b/c |
|
89 | pending file src: 'a/c' -> dst: 'b/c' | |
90 | resolving manifests |
|
90 | resolving manifests | |
91 | overwrite: False, partial: False |
|
91 | overwrite: False, partial: False | |
92 | ancestor: f9b20c0d4c51, local: 397f8b00a740+, remote: ce36d17b18fb |
|
92 | ancestor: f9b20c0d4c51, local: 397f8b00a740+, remote: ce36d17b18fb |
@@ -29,9 +29,9 b'' | |||||
29 | b |
|
29 | b | |
30 | b2 |
|
30 | b2 | |
31 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
31 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
32 |
c2 -> |
|
32 | src: 'a2' -> dst: 'c2' ! | |
33 | b -> a * |
|
33 | src: 'a' -> dst: 'b' * | |
34 | b2 -> a2 ! |
|
34 | src: 'a2' -> dst: 'b2' ! | |
35 | checking for directory renames |
|
35 | checking for directory renames | |
36 | a2: divergent renames -> dr |
|
36 | a2: divergent renames -> dr | |
37 | resolving manifests |
|
37 | resolving manifests | |
@@ -176,7 +176,7 b' Check for issue3074' | |||||
176 | unmatched files in other: |
|
176 | unmatched files in other: | |
177 | newfile |
|
177 | newfile | |
178 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
178 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
179 | newfile -> file % |
|
179 | src: 'file' -> dst: 'newfile' % | |
180 | checking for directory renames |
|
180 | checking for directory renames | |
181 | file: rename and delete -> rd |
|
181 | file: rename and delete -> rd | |
182 | resolving manifests |
|
182 | resolving manifests |
@@ -81,7 +81,7 b' args:' | |||||
81 | unmatched files in other: |
|
81 | unmatched files in other: | |
82 | b |
|
82 | b | |
83 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
83 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
84 | b -> a * |
|
84 | src: 'a' -> dst: 'b' * | |
85 | checking for directory renames |
|
85 | checking for directory renames | |
86 | resolving manifests |
|
86 | resolving manifests | |
87 | overwrite: False, partial: False |
|
87 | overwrite: False, partial: False | |
@@ -116,7 +116,7 b' args:' | |||||
116 | unmatched files in local: |
|
116 | unmatched files in local: | |
117 | b |
|
117 | b | |
118 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
118 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
119 | b -> a * |
|
119 | src: 'a' -> dst: 'b' * | |
120 | checking for directory renames |
|
120 | checking for directory renames | |
121 | resolving manifests |
|
121 | resolving manifests | |
122 | overwrite: False, partial: False |
|
122 | overwrite: False, partial: False | |
@@ -154,7 +154,7 b' args:' | |||||
154 | unmatched files in other: |
|
154 | unmatched files in other: | |
155 | b |
|
155 | b | |
156 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
156 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
157 | b -> a * |
|
157 | src: 'a' -> dst: 'b' * | |
158 | checking for directory renames |
|
158 | checking for directory renames | |
159 | resolving manifests |
|
159 | resolving manifests | |
160 | overwrite: False, partial: False |
|
160 | overwrite: False, partial: False | |
@@ -189,7 +189,7 b' args:' | |||||
189 | unmatched files in local: |
|
189 | unmatched files in local: | |
190 | b |
|
190 | b | |
191 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
191 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
192 | b -> a * |
|
192 | src: 'a' -> dst: 'b' * | |
193 | checking for directory renames |
|
193 | checking for directory renames | |
194 | resolving manifests |
|
194 | resolving manifests | |
195 | overwrite: False, partial: False |
|
195 | overwrite: False, partial: False | |
@@ -223,7 +223,7 b' args:' | |||||
223 | unmatched files in other: |
|
223 | unmatched files in other: | |
224 | b |
|
224 | b | |
225 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
225 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
226 | b -> a |
|
226 | src: 'a' -> dst: 'b' | |
227 | checking for directory renames |
|
227 | checking for directory renames | |
228 | resolving manifests |
|
228 | resolving manifests | |
229 | overwrite: False, partial: False |
|
229 | overwrite: False, partial: False | |
@@ -253,7 +253,7 b' args:' | |||||
253 | unmatched files in local: |
|
253 | unmatched files in local: | |
254 | b |
|
254 | b | |
255 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
255 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
256 | b -> a |
|
256 | src: 'a' -> dst: 'b' | |
257 | checking for directory renames |
|
257 | checking for directory renames | |
258 | resolving manifests |
|
258 | resolving manifests | |
259 | overwrite: False, partial: False |
|
259 | overwrite: False, partial: False | |
@@ -280,7 +280,7 b' args:' | |||||
280 | unmatched files in other: |
|
280 | unmatched files in other: | |
281 | b |
|
281 | b | |
282 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
282 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
283 | b -> a |
|
283 | src: 'a' -> dst: 'b' | |
284 | checking for directory renames |
|
284 | checking for directory renames | |
285 | resolving manifests |
|
285 | resolving manifests | |
286 | overwrite: False, partial: False |
|
286 | overwrite: False, partial: False | |
@@ -312,7 +312,7 b' args:' | |||||
312 | unmatched files in local: |
|
312 | unmatched files in local: | |
313 | b |
|
313 | b | |
314 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
314 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
315 | b -> a |
|
315 | src: 'a' -> dst: 'b' | |
316 | checking for directory renames |
|
316 | checking for directory renames | |
317 | resolving manifests |
|
317 | resolving manifests | |
318 | overwrite: False, partial: False |
|
318 | overwrite: False, partial: False | |
@@ -370,8 +370,8 b' m "um a c" "um x c" " " "10 do merg' | |||||
370 | unmatched files in other: |
|
370 | unmatched files in other: | |
371 | c |
|
371 | c | |
372 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
372 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
373 |
|
|
373 | src: 'a' -> dst: 'c' ! | |
374 | b -> a ! |
|
374 | src: 'a' -> dst: 'b' ! | |
375 | checking for directory renames |
|
375 | checking for directory renames | |
376 | a: divergent renames -> dr |
|
376 | a: divergent renames -> dr | |
377 | resolving manifests |
|
377 | resolving manifests | |
@@ -649,7 +649,7 b' m "um a c" "um x c" " " "10 do merg' | |||||
649 | unmatched files in other: |
|
649 | unmatched files in other: | |
650 | b |
|
650 | b | |
651 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
651 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
652 | b -> a * |
|
652 | src: 'a' -> dst: 'b' * | |
653 | checking for directory renames |
|
653 | checking for directory renames | |
654 | resolving manifests |
|
654 | resolving manifests | |
655 | overwrite: False, partial: False |
|
655 | overwrite: False, partial: False | |
@@ -683,7 +683,7 b' m "um a c" "um x c" " " "10 do merg' | |||||
683 | unmatched files in local: |
|
683 | unmatched files in local: | |
684 | b |
|
684 | b | |
685 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
685 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
686 | b -> a * |
|
686 | src: 'a' -> dst: 'b' * | |
687 | checking for directory renames |
|
687 | checking for directory renames | |
688 | resolving manifests |
|
688 | resolving manifests | |
689 | overwrite: False, partial: False |
|
689 | overwrite: False, partial: False | |
@@ -721,7 +721,7 b' m "nm a b" "um x a" " " "22 get a, ' | |||||
721 | unmatched files in other: |
|
721 | unmatched files in other: | |
722 | c |
|
722 | c | |
723 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
723 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
724 | b -> a * |
|
724 | src: 'a' -> dst: 'b' * | |
725 | checking for directory renames |
|
725 | checking for directory renames | |
726 | resolving manifests |
|
726 | resolving manifests | |
727 | overwrite: False, partial: False |
|
727 | overwrite: False, partial: False |
General Comments 0
You need to be logged in to leave comments.
Login now