[issue278] inappropriate merge conflicts

[Hollis Blanchard]

New submission from Hollis Blanchard <hollis at penguinppc.org>:

Steps to reproduce:
hg clone -r 29861ae27914 http://xenbits.xensource.com/ext/xenppc-unstable.hg
hg clone -r 0ec4b9dfd5b4 http://xenbits.xensource.com/xen-unstable.hg
cd xenppc-unstable.hg
hg pull ../xen-unstable.hg
hg merge

Results:
 local changed tools/vtpm/tpm_emulator-0.2b-x86_64.patch which remote deleted
(k)eep or (d)elete?

However, hg log reveals that tools/vtpm/tpm_emulator-0.2b-x86_64.patch has never
been modified by a "local" (PPC) changeset, so the file should be deleted
without user intervention.

Benoit looked into this issue a little, and found that the merge ancestor's file
revision is newer than the file revision in the local/PPC tree, and this is
causing the issue. This may be due to an old bug which generated too many file
revisions during merges (5007e0bdeed21f3e523cef5fee837280753d7449).

----------
messages: 1453
nosy: ThomasAH, hollisb, tonfa
priority: bug
status: unread
title: inappropriate merge conflicts

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