Patchwork [4,of,6] merge: backout 760c0d67ce5e "process files in sorted order" (issue3769)

login
register
mail settings
Submitter Mads Kiilerich
Date Jan. 20, 2013, 1:18 p.m.
Message ID <217cf94d3908bff8e47d.1358687887@localhost6.localdomain6>
Download mbox | patch
Permalink /patch/689/
State Superseded
Commit 26627c30735a610f59979a36885b327b25d8dbff
Headers show

Comments

Mads Kiilerich - Jan. 20, 2013, 1:18 p.m.
# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1358687872 -3600
# Branch stable
# Node ID 217cf94d3908bff8e47dd7b120c1042320e0738c
# Parent  c051eb129d7674a9dc77c598e385b6f208d2738b
merge: backout 760c0d67ce5e "process files in sorted order" (issue3769)

The extra manifest sorts made a noticable difference when rebasing big repos
with few changes.

Instead the observable behavior has been stabilized by previous changes and
760c0d67ce5e is no longer needed.

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -228,7 +228,7 @@  def manifestmerge(repo, p1, p2, pa, over
 
     prompts = []
     # Compare manifests
-    for f, n in sorted(m1.iteritems()):
+    for f, n in m1.iteritems():
         if partial and not partial(f):
             continue
         if f in m2:
@@ -268,7 +268,7 @@  def manifestmerge(repo, p1, p2, pa, over
             else:
                 act("other deleted", "r", f)
 
-    for f, n in sorted(m2.iteritems()):
+    for f, n in m2.iteritems():
         if partial and not partial(f):
             continue
         if f in m1 or f in copied: # files already visited