# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1331835102 18000
# Node ID 7b9bf72430bab927974f4e9404880271e3dbd2e6
# Parent  33fcad3cfbbcd1152ac2ec2292e1f41ad3092692# Parent  594fc9329628df58da2854e11eea078af0b4750f
merge with stable

diff -r 33fcad3cfbbc -r 7b9bf72430ba mercurial/dirstate.py
--- 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):
diff -r 33fcad3cfbbc -r 7b9bf72430ba mercurial/merge.py
--- 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