warning about divergent renames

Dirkjan Ochtman dirkjan at ochtman.nl
Fri Sep 10 14:29:55 CDT 2010


On Fri, Sep 10, 2010 at 20:34, Matt Mackall <mpm at selenic.com> wrote:
> This is another instance of an issue that needs full historical context
> to progress.
>
> There originally wasn't a warning, then I added one after various people
> complained. Notably there's a warning in the book about Mercurial not
> doing -more- in this case.

I suspected something like that. Do you know/remember what the edge
cases are why people would want to be aware of this? I think it has to
do with merging, right? When you merge a file that has modifications
on one side and a divergent rename on the other?

Cheers,

Dirkjan


More information about the Mercurial-devel mailing list