Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 15637:7f01ad702405 stable
icasefs: use util.normcase() instead of str.lower() or os.path.normpath()
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Mon, 12 Dec 2011 17:10:19 +0900 |
| parents | b0a88bda3381 |
| children | 5402fd9dd13e d550168f11ce |
line wrap: on
line diff
--- a/mercurial/merge.py Thu Dec 15 16:18:10 2011 +0100 +++ b/mercurial/merge.py Mon Dec 12 17:10:19 2011 +0900 @@ -7,7 +7,7 @@ from node import nullid, nullrev, hex, bin from i18n import _ -import scmutil, util, filemerge, copies, subrepo, encoding +import scmutil, util, filemerge, copies, subrepo import errno, os, shutil class mergestate(object): @@ -100,7 +100,7 @@ "check for case folding collisions in the destination context" folded = {} for fn in mctx: - fold = encoding.lower(fn) + fold = util.normcase(fn) if fold in folded: raise util.Abort(_("case-folding collision between %s and %s") % (fn, folded[fold]))