Show More
@@ -314,7 +314,7 b' def mergecopies(repo, c1, c2, ca):' | |||
|
314 | 314 | if fullcopy: |
|
315 | 315 | repo.ui.debug(" all copies found (* = to merge, ! = divergent, " |
|
316 | 316 | "% = renamed and deleted):\n") |
|
317 | for f in fullcopy: | |
|
317 | for f in sorted(fullcopy): | |
|
318 | 318 | note = "" |
|
319 | 319 | if f in copy: |
|
320 | 320 | note += "*" |
@@ -25,8 +25,8 b'' | |||
|
25 | 25 | b |
|
26 | 26 | c |
|
27 | 27 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
28 | src: 'a' -> dst: 'b' * | |
|
28 | 29 | src: 'a' -> dst: 'c' * |
|
29 | src: 'a' -> dst: 'b' * | |
|
30 | 30 | checking for directory renames |
|
31 | 31 | resolving manifests |
|
32 | 32 | overwrite: False, partial: False |
@@ -29,9 +29,9 b'' | |||
|
29 | 29 | b |
|
30 | 30 | b2 |
|
31 | 31 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
32 | src: 'a2' -> dst: 'c2' ! | |
|
33 | 32 | src: 'a' -> dst: 'b' * |
|
34 | 33 | src: 'a2' -> dst: 'b2' ! |
|
34 | src: 'a2' -> dst: 'c2' ! | |
|
35 | 35 | checking for directory renames |
|
36 | 36 | a2: divergent renames -> dr |
|
37 | 37 | resolving manifests |
@@ -370,8 +370,8 b' m "um a c" "um x c" " " "10 do merg' | |||
|
370 | 370 | unmatched files in other: |
|
371 | 371 | c |
|
372 | 372 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
373 | src: 'a' -> dst: 'b' ! | |
|
373 | 374 | src: 'a' -> dst: 'c' ! |
|
374 | src: 'a' -> dst: 'b' ! | |
|
375 | 375 | checking for directory renames |
|
376 | 376 | a: divergent renames -> dr |
|
377 | 377 | resolving manifests |
General Comments 0
You need to be logged in to leave comments.
Login now