[issue2601] Rename file over a currently tracked file

[Ken Earley]

New submission from Ken Earley <ken.earley at gmail.com>:

If you fork repo A into repo B, then rename a file in repo B to something that is 
already tracked, the next merge will not merge as expected:

----------
After fork
----------
Repo A
one.txt
two.txt

Repo B (copied from A)
one.txt
two.txt

-------------------------
After repo B gets changed
-------------------------
Repo A
one.txt
two.txt

Repo B
one.txt (one.txt was deleted and two.txt renamed to one.txt)


At this point, the expectation is that any change to one.txt in Repo A would be 
ignored, and any change in two.txt in Repo A would merge to one.txt in Repo B.

Instead I get this:

local changed special.txt which remote deleted
use (c)hanged version or (d)eleted?

----------
messages: 14975
nosy: kenearley
priority: bug
status: unread
title: Rename file over a currently tracked file

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2601>
____________________________________________________