# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2013-05-17 22:22:08
# Node ID 0ec31231afad3fc171f882226aae50d4737559b5
# Parent  f184fe1e2ac5cd57f59be624a3d1576b2d11f5f7
# Parent  865beb8497208ee8e719c939035a6bb5cd9238fc

merge with stable

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -181,7 +181,7 @@ class dirstate(object):
             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):