--- a/hgext/convert/subversion.py Thu Oct 19 03:20:47 2017 +0530
+++ b/hgext/convert/subversion.py Wed Oct 18 18:11:50 2017 -0400
@@ -352,8 +352,10 @@
raise error.Abort(_('svn: revision %s is not an integer') %
revs[0])
- self.trunkname = self.ui.config('convert', 'svn.trunk',
- 'trunk').strip('/')
+ trunkcfg = self.ui.config('convert', 'svn.trunk')
+ if trunkcfg is None:
+ trunkcfg = 'trunk'
+ self.trunkname = trunkcfg.strip('/')
self.startrev = self.ui.config('convert', 'svn.startrev')
try:
self.startrev = int(self.startrev)