changeset 670:186f13b35d15

Merge backout of incorrect patch.
author Augie Fackler <durin42@gmail.com>
date Fri, 20 Aug 2010 20:37:54 -0500
parents 6be7c9ace365 (current diff) a8101fc49663 (diff)
children e910e3ebd23b
files
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/svnmeta.py
+++ b/hgsubversion/svnmeta.py
@@ -55,7 +55,9 @@ class SVNMeta(object):
                                                  'usebranchnames', True)
 
         # FIXME: test that this hasn't changed! defer & compare?
-        self.subdir = subdir and '/'.join(p for p in subdir.split('/') if p) or ''
+        self.subdir = subdir
+        if self.subdir and self.subdir[0] == '/':
+            self.subdir = self.subdir[1:]
         self.branches = {}
         if os.path.exists(self.branch_info_file):
             f = open(self.branch_info_file)