facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity

merge: backout manifest sorting and workarounds for cost of it

Browse Source 
Backout f6ac62c2cfa7 and 14f4258e3526 which no longer are needed.
This commit is contained in:
Mads Kiilerich 2013-02-04 02:46:38 +01:00
parent ee476759ff
commit c2bd1c416f
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mercurial/merge.py
View File

@ -228,10 +228,7 @@ def manifestmerge(repo, p1, p2, pa, overwrite, partial):
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 @@ def manifestmerge(repo, p1, p2, pa, overwrite, partial):
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