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

[Matt Mackall]

On Wed, Aug 08, 2007 at 03:28:09PM +0200, Benoit Boissinot wrote:
> 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.

Yes.

-- 
Mathematics is the supreme nostalgia of our time.