Mercurial > hg
changeset 33808:055fee3547df
merge: removed sorting in casefolding detection, for a slight performance win
It was not required for the correctness of the algorithm.
Differential Revision: https://phab.mercurial-scm.org/D30
| author | Alex Gaynor <agaynor@mozilla.com> |
|---|---|
| date | Fri, 14 Jul 2017 19:27:28 +0000 |
| parents | b70029f355a3 |
| children | 1bf5c5507614 |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Thu Aug 10 21:00:30 2017 -0700 +++ b/mercurial/merge.py Fri Jul 14 19:27:28 2017 +0000 @@ -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")