Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 42110:3a7efcbdf288

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: print list of divergent renames in sorted order The current order is not obvious to the user (and I may change it in a later patch). Lexicographical order seems like the obvious choice here. Differential Revision: https://phab.mercurial-scm.org/D6227
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 12 Apr 2019 09:41:08 -0700
parents 566daffc607d
children beec7fc6adec
line wrap: on
line diff
--- a/mercurial/merge.py	Fri Apr 12 12:20:38 2019 -0400
+++ b/mercurial/merge.py	Fri Apr 12 09:41:08 2019 -0700
@@ -2131,14 +2131,14 @@
         for f, fl in sorted(diverge.iteritems()):
             repo.ui.warn(_("note: possible conflict - %s was renamed "
                            "multiple times to:\n") % f)
-            for nf in fl:
+            for nf in sorted(fl):
                 repo.ui.warn(" %s\n" % nf)
 
         # rename and delete
         for f, fl in sorted(renamedelete.iteritems()):
             repo.ui.warn(_("note: possible conflict - %s was deleted "
                            "and renamed to:\n") % f)
-            for nf in fl:
+            for nf in sorted(fl):
                 repo.ui.warn(" %s\n" % nf)
 
         ### apply phase