# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 2009-08-06 05:52:35
# Node ID 19d07553d1b29f554b8478437a30b85a20312c5f
# Parent  81900431589f363a922086048be7ede2c206960b
# Parent  f6683a7011e9c856e4b6f1fc0483ee104ce8f351

Merge backout of 26fa0e31011d

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -59,7 +59,7 @@ class dirstate(object):
     def _foldmap(self):
         f = {}
         for name in self._map:
-            f[util.realpath(self._join(name))] = name
+            f[os.path.normcase(name)] = name
         return f
 
     @propertycache
@@ -340,7 +340,7 @@ class dirstate(object):
             self._ui.warn(_("not in dirstate: %s\n") % f)
 
     def _normalize(self, path, knownpath):
-        norm_path = util.realpath(self._join(path))
+        norm_path = os.path.normcase(path)
         fold_path = self._foldmap.get(norm_path, None)
         if fold_path is None:
             if knownpath or not os.path.exists(os.path.join(self._root, path)):
diff --git a/tests/test-path-normalization b/tests/test-path-normalization
deleted file mode 100755
--- a/tests/test-path-normalization
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-hg clone --quiet $TESTDIR/test-path-normalization.hg t
-exec hg st -R t
diff --git a/tests/test-path-normalization.hg b/tests/test-path-normalization.hg
deleted file mode 100644
index 73ea086c424d1d011310533a43f74582f1835ff5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001