branch | stable |
changeset 24833 | cb981009d697 |
parent 24635 | 21e1ece30f8c |
child 25151 | 6eb4bdad198f |
--- a/mercurial/dirstate.py Tue Apr 21 21:02:08 2015 -0300 +++ b/mercurial/dirstate.py Wed Apr 22 23:38:52 2015 +0900 @@ -40,10 +40,7 @@ self._root = 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._rootdir = pathutil.normasprefix(root) self._dirty = False self._dirtypl = False self._lastnormaltime = 0