[issue448] Merge into renamed directory
mercurial-bugs at selenic.com
Mon Dec 11 10:48:25 CST 2006
New submission from tailgunner <tailgunner at smtp.ru>:
Sometimes, when a merge involves a change to a file which resides in a renamed
merge algorithm can't figure out that that change should be applied to the
renamed file, and
instead promts "remote changed file foo which local deleted, keep/delete?".
I couldn't come up with with small self-contained reproduction recipe, but AFAIK
the following should suffice:
make a clone of Mercurial mainline repository
rename "hgext" to "hg-ext"
make another clone
change some file under "hgext" (I added a space to acl.py)
Now try to merge both clones.
I think there's a bug in merge.py::findcopies::findold, because if I comment out
this check in findold:
if fc.rev() < limit:
problem goes away.
nosy: mpm, tailgunner
title: Merge into renamed directory
Mercurial issue tracker <mercurial-bugs at selenic.com>
More information about the Mercurial-devel