D4929: cmdutil: sort unresolved paths

indygreg (Gregory Szorc) phabricator at mercurial-scm.org
Tue Oct 9 18:11:36 EDT 2018


This revision was automatically updated to reflect the committed changes.
Closed by commit rHG57500950f40e: cmdutil: sort unresolved paths (authored by indygreg, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D4929?vs=11771&id=11773

REVISION DETAIL
  https://phab.mercurial-scm.org/D4929

AFFECTED FILES
  mercurial/cmdutil.py

CHANGE DETAILS

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -581,7 +581,7 @@
     if unresolvedlist:
         mergeliststr = '\n'.join(
             ['    %s' % util.pathto(repo.root, encoding.getcwd(), path)
-             for path in unresolvedlist])
+             for path in sorted(unresolvedlist)])
         msg = _('''Unresolved merge conflicts:
 
 %s



To: indygreg, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list