# HG changeset patch
# User David Schleimer <dschleimer@fb.com>
# Date 1377649289 25200
# Node ID 80a456b77ade8ab0d7a64decc6421d1a041549f9
# Parent  91d061989acc2e92a3796186c3224b69c1c178bf
layouts: fix remotepath for default branch in standard layout

diff --git a/hgsubversion/layouts/standard.py b/hgsubversion/layouts/standard.py
--- 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: