diff mercurial/subrepo.py @ 15208:d0694223861a

merge with stable

--- 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"""