# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1318026132 18000
# Node ID d0694223861a3a02c59538779a1f375cf991540f
# Parent  0f7f9f06c7592b8771894348910961869944b775# Parent  fccd350acf799f756e3e09166d02b22f1360336c
merge with stable

diff -r 0f7f9f06c759 -r d0694223861a mercurial/subrepo.py
--- 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"""