Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorMatt Mackall <mpm@selenic.com>
Fri, 07 Oct 2011 17:22:12 -0500
changeset 15208 d0694223861a
parent 15207 0f7f9f06c759 (current diff)
parent 15191 fccd350acf79 (diff)
child 15209 10f85a735601
merge with stable
mercurial/subrepo.py file | annotate | diff | comparison | revisions 
--- a/mercurial/subrepo.py	Thu Oct 06 19:45:26 2011 -0300
+++ b/mercurial/subrepo.py	Fri Oct 07 17:22:12 2011 -0500
@@ -202,7 +202,8 @@
     parent = repo
     while util.safehasattr(parent, '_subparent'):
         parent = parent._subparent
-    return repo.root[len(parent.root)+1:]
+    p = parent.root.rstrip(os.sep)
+    return repo.root[len(p) + 1:]
 
 def subrelpath(sub):
     """return path to this subrepo as seen from outermost repo"""
Mercurial