bzr merge-upstream: why delete and add the same unchanged file?

[Jelmer Vernooij]

Am 20/03/12 21:58, schrieb James Westby:
> On Tue, 20 Mar 2012 16:20:29 -0300, Andreas Hasenack <andreas at canonical.com> wrote:
>> Why is it removing and adding the same file? This file (and several
>> others) didn't change between ubuntu:landscape-client and
>> lp:landscape-client, it's exactly the same.
> I'm assuming that this is the first time you've done any sort of merge
> between the two?
>
> Because they are unrelated branches from bzr's point of view, it has to
> reconcile the history and file-ids. For the history it joins the two
> revisions history together, which is fine. The file ids isn't so easy
> though, as they can't be joined.
>
> Therefore it replaces the ubuntu file ids with the upstream ones, which
> is why you see everything as removed and added.
>
> This is annoying, but it allows you to move forward, and only needs to
> happen once.
That's a good way to solve this.

Of course, where we do have an upstream branch available, it would be
*really* nice to use it in the branch ancestry and as extra parent for
upstream merges. That way the file ids wouldn't be different in the
first place, and we wouldn't have to do this manually. Having a common
ancestry helps for other things as well, like easy creation of daily builds.

Cheers,

Jelmer

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 900 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/ubuntu-distributed-devel/attachments/20120320/88bdb606/attachment.pgp>