Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/subrepo.py
branchstable
changeset 15055 d629f1e89021
parent 14994 a115b5ee9c63
child 15061 86380f24e697
child 15191 fccd350acf79 
--- a/mercurial/subrepo.py	Thu Aug 25 22:06:03 2011 +0300
+++ b/mercurial/subrepo.py	Fri Aug 26 16:23:35 2011 +0200
@@ -204,7 +204,7 @@
         parent = _abssource(repo._subparent, push, abort=False)
         if parent:
             parent = util.url(parent)
-            parent.path = posixpath.join(parent.path, source.path)
+            parent.path = posixpath.join(parent.path or '', source.path)
             parent.path = posixpath.normpath(parent.path)
             return str(parent)
     else: # recursion reached top repo
mercurial