About merging, third part

[John Arbash Meinel]

Thibault North wrote:

> Hello,
> I think I already sent this to the list, but I never saw it then... so
> here it is one more time.
>
> This is a copy/paste of a very simple situation where merging is
> required. A directory, 1/, is at home, while 2/ is created to another
> computer, using bzr branch.
> The user first puts a patch into 2/, then another on the same file
> into 1/.
> Now, he has two repositories with two different versions of that file.
> I think merging 2/ into 1/ should bring a conflict ... but it doesn't :


I reproduced this here. And bzr diff shows that the line was removed and
replaced with the value from 2.

When I tried diff3 on the same files I did indeed get a conflict (using
revno=1 as base).

I'm not really sure what the problem is. But I wanted to confirm it exists.
John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050620/4906bf85/attachment.pgp