changeset 15061 | 86380f24e697 |
parent 14999 | f6a737357195 |
parent 15055 | d629f1e89021 |
child 15149 | eaec9cf91aea |
--- a/mercurial/subrepo.py Thu Aug 25 11:03:16 2011 +0200 +++ b/mercurial/subrepo.py Fri Aug 26 16:08:24 2011 -0500 @@ -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