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

[Alexis S. L. Carvalho]

Thus spake Edward Lee:
> On 8/7/07, Edward Lee <edilee at mozilla.com> wrote:
> > Are there any known issues with rename
> Good news and bad news. Seems like it's an issue of |hg merge| and not
> |hg rename|. By renaming the files back to original, commit, rename to
> the new name, commit, mercurial is able to merge the files correctly
> when pulling changes. However, this problem of mercurial forgetting
> about the rename can occur again fairly easily.
> 
> > some reason after merging [6] some changes from (1) into (2), pulling
> > new changes results in "[(k)eep or (d)elete?]"
> > [6] http://hg.mozilla.org/mozilla-central/?rev/d7e93861f3f3
> The interesting thing here is that it turns out the merge just
> happened to not touch any of the renamed files. So any merges that
> don't involve the renamed files will have mercurial forgetting about
> the rename. Similarly, even if some of the renamed files are touched,
> the remaining renamed files that are untouched are also forgotten in
> the merge.

Changeset ad6b97132b81 in the crew-stable and crew repositories should
fix this.

Alexis