[PATCH] merge: handle case when heads are all bookmarks

[Matt Mackall]

On Wed, 2012-08-22 at 13:43 -0400, John Li wrote:
> # HG changeset patch
> # User John Li <jli at circularly.org>
> # Date 1345648715 14400
> # Node ID a76c74593ffc00a20a691abaa4748cf02658b98c
> # Parent  a0cf8f4cd38ba8c35132379b680ebf6d0e900e3d
> merge: handle case when heads are all bookmarks

Please specify the bad behavior this is fixing.

> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -4269,7 +4269,7 @@
>                               hint=_("run 'hg heads .' to see heads"))
>  
>          parent = repo.dirstate.p1()
> -        if len(nbhs) == 1:
> +        if len(nbhs) <= 1:
>              if len(bheads) > 1:
>                  raise util.Abort(_("heads are bookmarked - "
>                                     "please merge with an explicit rev"),
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel


-- 
Mathematics is the supreme nostalgia of our time.