Mercurial > hg > mercurial-source

diff mercurial/subrepo.py @ 15191:fccd350acf79 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: fix repo relative path calculation for root directories (issue3033)
author Matt Mackall <mpm@selenic.com>
date Sun, 02 Oct 2011 16:41:07 -0500 (2011-10-02)
parents d629f1e89021
children d0694223861a
line wrap: on
line diff
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -183,7 +183,8 @@
     parent = repo
     while hasattr(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"""