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

[Matt Mackall]

On Sun, 2009-01-04 at 21:33 +0100, Dirkjan Ochtman wrote:
> On 04/01/2009 21:23, Benoit Boissinot wrote:
> > (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 ?
> 
> Right. I ran into this at work. It was hard for me to articulate this.

This picture sucks, guys. Is this what you're trying to say:

--d1-d2-d3
    \  /  \
     o1----o2

I can't check out o1 and merge with d3, creating o2? Yes, that sounds
like a bug.

-- 
Mathematics is the supreme nostalgia of our time.