copies: report found copies sorted

mercurial/copies.py

@@ -314,7 +314,7 b' def mergecopies(repo, c1, c2, ca):'
     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 += "*"

tests/test-copy-move-merge.t

@@ -25,8 +25,8 b''
      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

tests/test-rename-merge1.t

@@ -29,9 +29,9 b''
      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

tests/test-rename-merge2.t

@@ -370,8 +370,8 b' m "um a c" "um x c" " " "10 do merg'
     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