Mercurial > public > mercurial-scm > hg-stable

diff mercurial/subrepo.py @ 15061:86380f24e697

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 26 Aug 2011 16:08:24 -0500
parents f6a737357195 d629f1e89021
children eaec9cf91aea
line wrap: on
line diff
--- 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