# HG changeset patch # User Brendan Cully # Date 1249537890 25200 # Node ID f6683a7011e9c856e4b6f1fc0483ee104ce8f351 # Parent 26fa0e31011ddedad3ada1a1ec417c3c57e93ffe Backed out changeset 26fa0e31011d. On OS X, it broke test-issue322, test-issue660, test-permissions, test-symlink-addremove, and test-walk. diff -r 26fa0e31011d -r f6683a7011e9 mercurial/dirstate.py --- a/mercurial/dirstate.py Sun Jul 26 18:02:06 2009 +0200 +++ b/mercurial/dirstate.py Wed Aug 05 22:51:30 2009 -0700 @@ -59,7 +59,7 @@ 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 @@ 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 -r 26fa0e31011d -r f6683a7011e9 tests/test-path-normalization --- a/tests/test-path-normalization Sun Jul 26 18:02:06 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -#!/bin/sh - -hg clone --quiet $TESTDIR/test-path-normalization.hg t -exec hg st -R t diff -r 26fa0e31011d -r f6683a7011e9 tests/test-path-normalization.hg Binary file tests/test-path-normalization.hg has changed