Mercurial > hg-stable

changeset 24212:4ef4e3c3c006

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 05 Mar 2015 15:52:07 -0600
parents 1e3e064c16a1 (current diff) 3cc630be5f09 (diff)
children e0c1328df872
files mercurial/dirstate.py
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/dirstate.py	Tue Mar 03 21:31:16 2015 -0500
+++ b/mercurial/dirstate.py	Thu Mar 05 15:52:07 2015 -0600
@@ -38,7 +38,12 @@
         self._opener = opener
         self._validate = validate
         self._root = root
-        self._rootdir = os.path.join(root, '')
+        # ntpath.join(root, '') of Python 2.7.9 does not add sep if root is
+        # UNC path pointing to root share (issue4557)
+        if root.endswith(os.sep):
+            self._rootdir = root
+        else:
+            self._rootdir = root + os.sep
         self._dirty = False
         self._dirtypl = False
         self._lastnormaltime = 0