##// END OF EJS Templates
merge: removed sorting in casefolding detection, for a slight performance win...
Alex Gaynor -
r33807:055fee35 default
parent child Browse files
Show More
@@ -753,7 +753,7 b' def _checkcollision(repo, wmf, actions):'
753
753
754 # check case-folding collision in provisional merged manifest
754 # check case-folding collision in provisional merged manifest
755 foldmap = {}
755 foldmap = {}
756 for f in sorted(pmmf):
756 for f in pmmf:
757 fold = util.normcase(f)
757 fold = util.normcase(f)
758 if fold in foldmap:
758 if fold in foldmap:
759 raise error.Abort(_("case-folding collision between %s and %s")
759 raise error.Abort(_("case-folding collision between %s and %s")
General Comments 0
You need to be logged in to leave comments. Login now