[PATCH] fetch: do not count closed branches when attempting to infer a merge

[Dirkjan Ochtman]

On 16/03/2009 21:50, Benjamin Pollack wrote:
> diff --git a/hgext/fetch.py b/hgext/fetch.py
> --- a/hgext/fetch.py
> +++ b/hgext/fetch.py
> @@ -52,7 +52,7 @@
>               raise util.Abort(_('outstanding uncommitted changes'))
>           if del_:
>               raise util.Abort(_('working directory is missing some files'))
> -        if len(repo.branchheads(branch))>  1:
> +        if len(repo.branchheads(branch, closed=False))>  1:
>               raise util.Abort(_('multiple heads in this branch '
>                                  '(use "hg heads ." and "hg merge" to merge)'))

Looks good. While we're at it: why is this not the default?

Cheers,

Dirkjan