# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2012-09-29 16:57:16
# Node ID a41fd730f2305410e3f03f2f8400d66f2c9da0fe
# Parent  16ec37411db5696ce981d18296e93bde71e2d7cb

scmutil: backout 83785bb56062 (issue3643)

diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -229,7 +229,6 @@ class vfs(abstractvfs):
         if expand:
             base = os.path.realpath(util.expandpath(base))
         self.base = base
-        self.basesep = self.base + os.sep
         self._setmustaudit(audit)
         self.createmode = None
         self._trustnlink = None
@@ -332,8 +331,9 @@ class vfs(abstractvfs):
 
     def join(self, path):
         if path:
-            return path.startswith('/') and path or (self.basesep + path)
-        return self.base
+            return os.path.join(self.base, path)
+        else:
+            return self.base
 
 opener = vfs