Lots of conflicts when trying to merge protobuf to maverick

[Jelmer Vernooij]

Hi Elliot,

On Tue, 2010-06-08 at 16:46 -0400, Elliot Murphy wrote:
> I took a look at merge protobuf from sid just now, and was surprised
> to see a lot of conflicts.
> 
> What is the right way to get this merging smoothly again? The
> differences from debian should be very minor, a single patch file and
> the normal stuff in changelog and control.
> Is this a bug in the bzr merge-package command?
> 
> Thanks for your advice, full recipe below:
> 
> bzr get lp:ubuntu/maverick/protobuf; cd protobuf
> bzr merge-package lp:debian/sid/protobuf
This happens when you import from two sources with different file ids.
Bazaar doesn't recognize that two files (even though they have the same
path) are the same and will generate these conflicts. 

Cheers,

Jelmer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/ubuntu-distributed-devel/attachments/20100608/88e7b141/attachment.pgp