changeset 1090:80a456b77ade

layouts: fix remotepath for default branch in standard layout
author David Schleimer <dschleimer@fb.com>
date Tue, 27 Aug 2013 17:21:29 -0700
parents 91d061989acc
children 384eb7e05b61
files hgsubversion/layouts/standard.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/layouts/standard.py
+++ b/hgsubversion/layouts/standard.py
@@ -27,8 +27,10 @@ class StandardLayout(base.BaseLayout):
         return 'branches/%s' % branch
 
     def remotepath(self, branch, subdir='/'):
+        if subdir == '/':
+            subdir = ''
         branchpath = 'trunk'
-        if branch:
+        if branch and branch != 'default':
             if branch.startswith('../'):
                 branchpath = branch[3:]
             else: