|hg rename|d files no longer |hg merge|ing [(k)eep or (d)elete?]

[Benoit Boissinot]

On 8/8/07, Matt Mackall <mpm at selenic.com> wrote:
> And if we take our first graph and add an edge:
>
>  0-2-x-4
>   \ \ / \
>    1-3-y-5       (extra changesets added to make merges meaningful)
>
> ..then we can stop our search when merging y and 4 at 3, because the
> rename was already visible to both sides.

shouldn't we examine 2 as well ?

there might be a rename in x and a change in y.
>
> So we have to include all changesets that aren't common to both sides
> in our rename search. Fun, a new graph algorithm.
>

regards,

Benoit