[PATCH] fixing Issue2653

[Augie Fackler]

On Feb 24, 2011, at 6:06 AM, Pavel Boldin wrote:

> # HG changeset patch
> # User Pavel Boldin <boldin.pavel at gmail.com>
> # Date 1298548449 -10800
> # Node ID b02be8072e8497cf61e308dc7513d78c56079303
> # Parent  643b8212813e631b5525049fc4321a34a4def105
> fixing Issue2653
> 
> diff -r 643b8212813e -r b02be8072e84 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 14:54:09 2011 +0300
> @@ -761,7 +761,7 @@
>             author = author and self.recode(author) or ''
>             try:
>                 branch = self.module.split("/")[-1]
> -                if branch == 'trunk':
> +                if branch == self.ui.config('convert', 'svn.trunk'):

shouldn't this be self.ui.config('convert', 'svn.trunk', 'trunk') so the default is trunk?

>                     branch = ''
>             except IndexError:
>                 branch = None
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel