# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 2018-10-09 19:56:11
# Node ID 57500950f40e2903df0e1fe20a3dfab7ad0df3cb
# Parent  ca4a32d0a4d613f5a68a47ba539930a903b9c9bc

cmdutil: sort unresolved paths

I noticed that `hg status` was printing unresolved paths in a
non-deterministic order. This patch fixes that.

I'm not sure if the sorting should be done in
merge.mergestate.unresolved() instead. Either way fixes the
presentation issue.

Differential Revision: https://phab.mercurial-scm.org/D4929

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -581,7 +581,7 @@ def _conflictsmsg(repo):
     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