--- a/mercurial/copies.py Tue Jan 15 02:59:12 2013 +0100
+++ b/mercurial/copies.py Wed Dec 12 02:38:14 2012 +0100
@@ -314,7 +314,7 @@
if fullcopy:
repo.ui.debug(" all copies found (* = to merge, ! = divergent, "
"% = renamed and deleted):\n")
- for f in fullcopy:
+ for f in sorted(fullcopy):
note = ""
if f in copy:
note += "*"
--- a/tests/test-copy-move-merge.t Tue Jan 15 02:59:12 2013 +0100
+++ b/tests/test-copy-move-merge.t Wed Dec 12 02:38:14 2012 +0100
@@ -25,8 +25,8 @@
b
c
all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+ src: 'a' -> dst: 'b' *
src: 'a' -> dst: 'c' *
- src: 'a' -> dst: 'b' *
checking for directory renames
resolving manifests
overwrite: False, partial: False
--- a/tests/test-rename-merge1.t Tue Jan 15 02:59:12 2013 +0100
+++ b/tests/test-rename-merge1.t Wed Dec 12 02:38:14 2012 +0100
@@ -29,9 +29,9 @@
b
b2
all copies found (* = to merge, ! = divergent, % = renamed and deleted):
- src: 'a2' -> dst: 'c2' !
src: 'a' -> dst: 'b' *
src: 'a2' -> dst: 'b2' !
+ src: 'a2' -> dst: 'c2' !
checking for directory renames
a2: divergent renames -> dr
resolving manifests
--- a/tests/test-rename-merge2.t Tue Jan 15 02:59:12 2013 +0100
+++ b/tests/test-rename-merge2.t Wed Dec 12 02:38:14 2012 +0100
@@ -370,8 +370,8 @@
unmatched files in other:
c
all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+ src: 'a' -> dst: 'b' !
src: 'a' -> dst: 'c' !
- src: 'a' -> dst: 'b' !
checking for directory renames
a: divergent renames -> dr
resolving manifests