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

[Mads Kiilerich]

On 22/08/12 23:50, Kevin Bullock wrote:
> 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:

I guess that was a very subtle hint:
John, please add a test for this case to the test suite.

/Mads