What to do when a packaging branch is out of date

2012-03-20 Thread Andreas Hasenack
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 So apparently a package update can be prepared using udd, released into the archive, and the packaging branch still be out of date: $ bzr branch ubuntu:landscape-client landscape-client-12.04-0ubuntu1 Most recent Ubuntu version: 12.04-0ubuntu1

Re: What to do when a packaging branch is out of date

2012-03-20 Thread Scott Kitterman
On Tuesday, March 20, 2012 10:56:27 AM Andreas Hasenack wrote: So apparently a package update can be prepared using udd, released into the archive, and the packaging branch still be out of date: $ bzr branch ubuntu:landscape-client landscape-client-12.04-0ubuntu1 Most recent Ubuntu

Re: What to do when a packaging branch is out of date

2012-03-20 Thread Serge Hallyn
Quoting Scott Kitterman (ubu...@kitterman.com): On Tuesday, March 20, 2012 10:56:27 AM Andreas Hasenack wrote: So apparently a package update can be prepared using udd, released into the archive, and the packaging branch still be out of date: $ bzr branch ubuntu:landscape-client

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