[issue636] merge may use the wrong file contents for a file merge

[Alexis S. L. Carvalho]

New submission from Alexis S. L. Carvalho <alexis at cecm.usp.br>:

If local changes file foo and remote copies foo to bar and changes both files,
hg merge will:

- merge local foo and remote bar, putting the result in foo
- copy foo to bar
- merge local foo and remote foo, putting the result in foo

The problem is that the third step uses the results of the first file merge,
instead of using the original contents of foo, which can obviously give us wrong
results.

I'm attaching a script demonstrating the problem.

----------
files: double-merge
messages: 3532
nosy: ThomasAH, alexis, brendan, mpm
priority: bug
status: unread
title: merge may use the wrong file contents for a file merge
topic: merge

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue636>
____________________________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: double-merge
Type: application/octet-stream
Size: 432 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20070717/db1e2b5b/attachment.obj