Mercurial > hg

changeset 18542:46be5c9dac91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: backout manifest sorting and workarounds for cost of it Backout 8a811fa9a9c0 and 760c0d67ce5e which no longer are needed.
author Mads Kiilerich <madski@unity3d.com>
date Mon, 04 Feb 2013 02:46:38 +0100
parents 5ed6a375e9ca
children c8ba98bf0e71
files mercurial/merge.py
diffstat 1 files changed, 2 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Thu Jan 24 23:57:44 2013 +0100
+++ b/mercurial/merge.py	Mon Feb 04 02:46:38 2013 +0100
@@ -228,10 +228,7 @@
 
     prompts = []
     # Compare manifests
-    visit = m1.iteritems()
-    if repo.ui.debugflag:
-        visit = sorted(visit)
-    for f, n in visit:
+    for f, n in m1.iteritems():
         if partial and not partial(f):
             continue
         if f in m2:
@@ -271,10 +268,7 @@
             else:
                 act("other deleted", "r", f)
 
-    visit = m2.iteritems()
-    if repo.ui.debugflag:
-        visit = sorted(visit)
-    for f, n in visit:
+    for f, n in m2.iteritems():
         if partial and not partial(f):
             continue
         if f in m1 or f in copied: # files already visited