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

[Jelmer Vernooij]

Am 29/03/12 05:14, schrieb James Westby:
> On Tue, 20 Mar 2012 18:06:52 -0300, Andreas Hasenack <andreas at canonical.com> wrote:
>> I understand they are isolated and separated branches. I thought
>> supporting a bzr branch for the upstream branch was more of a
>> convenience and that merge-upstream would actually just export it to a
>> temporary tarball and then move on like if I had given it a tarball to
>> work with, but I see now that's not the case.
> Yeah, there is some old code in bzr-builddeb to do that, but I've
> forgotten how to activate it now :-)
I think I'm missing some context - are you talking about running "bzr
merge-upstream <branch>" ? That should still work.

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/20120329/b0905650/attachment.pgp>