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

Dirkjan Ochtman dirkjan at ochtman.nl
Sun Jan 4 14:33:16 CST 2009


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.

Cheers,

Dirkjan


More information about the Mercurial-devel mailing list