Mercurial > hg
changeset 19216:0ec31231afad
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 17 May 2013 17:22:08 -0500 |
| parents | f184fe1e2ac5 (current diff) 865beb849720 (diff) |
| children | 6cf8e3b4e074 |
| files | mercurial/dirstate.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/dirstate.py Tue May 14 11:23:18 2013 -0700 +++ b/mercurial/dirstate.py Fri May 17 17:22:08 2013 -0500 @@ -181,7 +181,7 @@ cwd = self.getcwd() path = util.pathto(self._root, cwd, f) if self._slash: - return util.normpath(path) + return util.pconvert(path) return path def __getitem__(self, key):