merge with stable

mercurial/dirstate.py

@@ -181,7 +181,7 b' 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):