alex_gaynor updated this revision to Diff 737.
alex_gaynor added a comment.
Herald added a reviewer: hg-reviewers.


  Undo a change which was incorrect

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D30?vs=46&id=737

BRANCH
  performance-changes (bookmark) on default (branch)

REVISION DETAIL
  https://phab.mercurial-scm.org/D30

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -753,7 +753,7 @@
 
     # check case-folding collision in provisional merged manifest
     foldmap = {}
-    for f in sorted(pmmf):
+    for f in pmmf:
         fold = util.normcase(f)
         if fold in foldmap:
             raise error.Abort(_("case-folding collision between %s and %s")



To: alex_gaynor, durin42, dsp, #hg-reviewers
Cc: quark, krbullock, dsp, mercurial-devel
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Reply via email to