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

[Patrick Mézard]

Le 27/08/12 20:51, John Li a écrit :
> On Mon, Aug 27, 2012 at 01:01:00PM -0500, Kevin Bullock wrote:
>> Looks good in principle, but for some reason I get whitespace weirdness on the output:
> 
> Sorry, my fault. An emacs save-hook "fixed" the trailing whitespace for
> the 2 blank lines in the "hg heads" output. Try this:
> 
> 
> 
> # HG changeset patch
> # User John Li <jli at circularly.org>
> # Date 1346075878 14400
> # Node ID a3e550fee75251841da36cdbb27959c47f169eeb
> # Parent  99a2a4ae35e2180b7f825ef2677c36d538eac4ba
> tests: merging bookmarked heads
> 
> 45b5eb2941d0 fixed an error that occured when heads being merged were both
> inactive bookmarks. Add a test for that case.

In crew-stable: http://hg.intevation.org/mercurial/crew/rev/19e4861f9730

Thanks!

--
Patrick Mézard