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

[Kevin Bullock]

On 22 Aug 2012, at 2:53 PM, 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
> 
> If all heads are bookmarks, merge fails to find what node to merge
> with (throws an IndexError while indexing into the non-bookmark heads
> list) as of 4a02cf4fbb2e. This catches that case and prints an error
> to specify a rev explicitly.

Can't repro with a simple test:

⁖ hg log -G --template '{rev}:{node|short} [{bookmarks}] {desc|firstline}\n'
@  2:e22802ab69b2 [feature] 2
|
| o  1:85b0c80a8c58 [master] 1
|/
o  0:ed46d4144007 [] 0

⁖ hg merge
abort: no matching bookmark to merge - please merge with an explicit rev or bookmark
(run 'hg heads' to see all heads)

⁖ hg version
Mercurial Distributed SCM (version 2.3+20120806)
(see http://mercurial.selenic.com for more information)

Can you send a simple test case to demonstrate?

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock