changeset 15191:fccd350acf79 stable

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
parents a9b0f5624ffc
children d0694223861a 384082750f2c dce522633122
files mercurial/subrepo.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/subrepo.py	Sat Oct 01 15:49:29 2011 -0500
+++ b/mercurial/subrepo.py	Sun Oct 02 16:41:07 2011 -0500
@@ -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"""