Mercurial > hg

diff mercurial/merge.py @ 18360:760c0d67ce5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: process files in sorted order
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Jan 2013 02:59:12 +0100
parents aadefcee1f5e
children 6252b4f1c4b4
line wrap: on
line diff
--- a/mercurial/merge.py	Wed Dec 12 02:38:14 2012 +0100
+++ b/mercurial/merge.py	Tue Jan 15 02:59:12 2013 +0100
@@ -228,7 +228,7 @@
                 break
 
     # Compare manifests
-    for f, n in m1.iteritems():
+    for f, n in sorted(m1.iteritems()):
         if partial and not partial(f):
             continue
         if f in m2:
@@ -274,7 +274,7 @@
             else:
                 act("other deleted", "r", f)
 
-    for f, n in m2.iteritems():
+    for f, n in sorted(m2.iteritems()):
         if partial and not partial(f):
             continue
         if f in m1 or f in copied: # files already visited