# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1425592327 21600
# Node ID 4ef4e3c3c00693868ba428e21ac092e559e4fcea
# Parent  1e3e064c16a12b4a2d67a5168fb3948e42884e85# Parent  3cc630be5f09ab586e1ca3f015456fe5611e6333
merge with stable

diff -r 1e3e064c16a1 -r 4ef4e3c3c006 mercurial/dirstate.py
--- 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