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

2012-03-29 Thread Jelmer Vernooij
Am 29/03/12 05:14, schrieb James Westby: On Tue, 20 Mar 2012 18:06:52 -0300, Andreas Hasenack andr...@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

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

2012-03-29 Thread James Westby
On Thu, 29 Mar 2012 12:21:41 +0200, Jelmer Vernooij jel...@canonical.com wrote: Am 29/03/12 05:14, schrieb James Westby: On Tue, 20 Mar 2012 18:06:52 -0300, Andreas Hasenack andr...@canonical.com wrote: I understand they are isolated and separated branches. I thought supporting a bzr

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

2012-03-29 Thread Jelmer Vernooij
Am 29/03/12 16:02, schrieb James Westby: On Thu, 29 Mar 2012 12:21:41 +0200, Jelmer Vernooij jel...@canonical.com wrote: Am 29/03/12 05:14, schrieb James Westby: On Tue, 20 Mar 2012 18:06:52 -0300, Andreas Hasenack andr...@canonical.com wrote: I understand they are isolated and separated

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

2012-03-29 Thread Andreas Hasenack
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 03/29/2012 11:07 AM, Jelmer Vernooij wrote: I think Andreas was asking about a way to just export the tarball and use it in merge-upstream without also merging the branch. Aha. I guess you could always use something like this: bzr export -d