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

[Kevin Bullock]

On 22 Aug 2012, at 4:50 PM, 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:

Nevermind, I got it reproduced. It happens if all heads are bookmarked *and* no bookmark is active. Patch looks good to me, and should probably go on stable.

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

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-devel/attachments/20120822/f5dec4b2/attachment-0002.html>