--- a/mercurial/bundlerepo.py	Wed Apr 22 23:38:52 2015 +0900
+++ b/mercurial/bundlerepo.py	Wed Apr 22 23:38:55 2015 +0900
@@ -16,6 +16,7 @@
 import os, tempfile, shutil
 import changegroup, util, mdiff, discovery, cmdutil, scmutil, exchange
 import localrepo, changelog, manifest, filelog, revlog, error, phases, bundle2
+import pathutil
 
 class bundlerevlog(revlog.revlog):
     def __init__(self, opener, indexfile, bundle, linkmapper):
@@ -352,7 +353,7 @@
         if parentpath == cwd:
             parentpath = ''
         else:
-            cwd = os.path.join(cwd,'')
+            cwd = pathutil.normasprefix(cwd)
             if parentpath.startswith(cwd):
                 parentpath = parentpath[len(cwd):]
     u = util.url(path)