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

[Edward Lee]

It seems that mercurial forgets about renamed files after some amount
of activity and prompts "remote changed <filename> which local deleted
[(k)eep or (d)elete?]" on |hg merge| even though it used to correctly
do "merging <oldname> and <newname>".

Are there any known issues with rename or some commands for me to
track down why mercurial doesn't try merging through the rename?

----

The repositories in question are cvs-mirror [1], mozilla-central [2],
and actionmonkey [3] where (1) acts like a read-only source of changes
for the other two. There's a changeset [4] that renamed some files on
(3) which was merged [5] back to (2). At this point pulling from (1)
into (2) works fine even with renamed files, but some reason after
merging [6] some changes from (1) into (2), pulling new changes
results in "[(k)eep or (d)elete?]"

So some reason after the merge, mercurial doesn't remember that it
renamed some files.

Ed

[1] http://hg.mozilla.org/cvs-trunk-mirror/
[2] http://hg.mozilla.org/mozilla-central/
[3] http://hg.mozilla.org/actionmonkey/
[4] http://hg.mozilla.org/actionmonkey/?rev/bd9c9cbf9ec8
[5] http://hg.mozilla.org/mozilla-central/?rev/0f62afa8267f
[6] http://hg.mozilla.org/mozilla-central/?rev/d7e93861f3f3