Mercurial > hg-stable
changeset 16261:7b9bf72430ba
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 15 Mar 2012 13:11:42 -0500 |
| parents | 33fcad3cfbbc (current diff) 594fc9329628 (diff) |
| children | bf7a6c3b2a4a |
| files | mercurial/merge.py |
| diffstat | 2 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/dirstate.py Thu Mar 15 13:11:03 2012 -0500 +++ b/mercurial/dirstate.py Thu Mar 15 13:11:42 2012 -0500 @@ -78,10 +78,6 @@ return self._copymap @propertycache - def _normroot(self): - return util.normcase(self._root) - - @propertycache def _foldmap(self): f = {} for name in self._map: @@ -406,7 +402,7 @@ folded = path else: folded = self._foldmap.setdefault(normed, - util.fspath(normed, self._normroot)) + util.fspath(normed, self._root)) return folded def normalize(self, path, isknown=False):
--- a/mercurial/merge.py Thu Mar 15 13:11:03 2012 -0500 +++ b/mercurial/merge.py Thu Mar 15 13:11:42 2012 -0500 @@ -170,7 +170,7 @@ if m and m != a: # changed from a to m return m if n and n != a: # changed from a to n - if (n == 'l' or a == 'l') and m1[f] != ma[f]: + if (n == 'l' or a == 'l') and m1.get(f) != ma.get(f): # can't automatically merge symlink flag when there # are file-level conflicts here, let filemerge take # care of it