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

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

2012-03-28 Thread James Westby
On Tue, 20 Mar 2012 18:06:52 -0300, Andreas Hasenack andr...@canonical.com wrote: Yes, and I don't have commit or upload rights to ubuntu:landscape-client, so it will always be the first time :) If your sponsor pushes to the branch then it will be there for the next time that you make a

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

2012-03-20 Thread Andreas Hasenack
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi, I'm experimenting with bzr merge-upstream and found what I think is an odd behavior. I'm probably just using it incorrectly, but I can't find out what I'm doing wrong. I'm merging lp:landscape-client into ubuntu:landscape-client. Let's say I'm

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

2012-03-20 Thread James Westby
On Tue, 20 Mar 2012 16:20:29 -0300, Andreas Hasenack andr...@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

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

2012-03-20 Thread Andreas Hasenack
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 03/20/2012 05:58 PM, James Westby wrote: On Tue, 20 Mar 2012 16:20:29 -0300, Andreas Hasenack andr...@canonical.com wrote: Why is it removing and adding the same file? This file (and several others) didn't change between ubuntu:landscape-client