[issue2342] merging can sometimes revert newer changes back

[Boris Figovsky]

New submission from Boris Figovsky <borfig at gmail.com>:

The attached file is a bundle of a simple repository.
- Heads are revisions 9 and 8;
- a_file was added in Rev 3 with contents AAA;
- a_file's content changed to BBB in Rev 6;
- Rev 7 is a merge with Rev 3, and thus has AAA in a_file;
- Rev 8 is a merge with Rev 6, and thus has BBB in b_file;
After unbundling, do the following:
$ hg up -r 8
and:
$ hg merge 7
says 'merging a_file'
a_file's content is now AAA, but BBB is a descendant of AAA!
Therefore, the BBB version is 'lost'.
This bug can be reproduced with 1.6.2, 1.6.1 and 1.5.4 (other versions were 
not checked...)

----------
files: state_before_merge
messages: 13429
nosy: borfig
priority: critical
status: unread
title: merging can sometimes revert newer changes back
topic: merge

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2342>
____________________________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: state_before_merge
Type: application/octet-stream
Size: 2103 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20100819/02f9d770/attachment.obj>