[PATCH 0 of 1] Allow merging different-branch ancestors

[Benoit Boissinot]

On Thu, Jan 01, 2009 at 04:26:27PM -0600, Matt Mackall wrote:
> On Thu, 2009-01-01 at 20:40 +0100, Dirkjan Ochtman wrote:
> > Here's a patch that allows merging named branches where the common ancestor is
> > one of the parents. It was formerly allowed only for one of the parents,
> > which seemed kind of weird.
> 
> Huh? I need a picture.

(time goes from left to right)

-(default)-(default)--(default)
    \                /
     ----(other)-----

In that case you can't merge "default" into "other", because the last cset
from "other" is an ancestor of the tip from "default".

Is it this problem ?

regards,

Benoit
-- 
:wq