[PATCH] Corrected patch for issue2653
Pavel Boldin
boldin.pavel at gmail.com
Thu Feb 24 06:41:54 CST 2011
# HG changeset patch
# User Pavel Boldin <boldin.pavel at gmail.com>
# Date 1298551065 -10800
# Node ID 90fc331de714fe2e95561dd0c164d500f10614e0
# Parent 643b8212813e631b5525049fc4321a34a4def105
fixing issue2653
diff -r 643b8212813e -r 90fc331de714 hgext/convert/subversion.py
--- a/hgext/convert/subversion.py Wed Feb 16 15:02:30 2011 +0100
+++ b/hgext/convert/subversion.py Thu Feb 24 15:37:45 2011 +0300
@@ -761,7 +761,9 @@
author = author and self.recode(author) or ''
try:
branch = self.module.split("/")[-1]
- if branch == 'trunk':
+ trunk_name = self.ui.config('convert', 'svn.trunk') or 'trunk'
+ trunk_name = trunk_name.strip('/')
+ if branch == trunk_name:
branch = ''
except IndexError:
branch = None
More information about the Mercurial-devel
mailing list