Re: [Oneiric-Topic] Packaging branches

2011-04-13 Thread Sebastien Bacher
Le mercredi 13 avril 2011 à 09:48 +0200, Martin Pitt a écrit : > usually I find it easier to get it from an upstream git diff. If > that's impractical, debdiffing the old against the new source works > too, of course. Hi, Right, I usually start a build of the new version and debdiff those while

Re: [Oneiric-Topic] Packaging branches

2011-04-13 Thread Martin Pitt
Robert Ancell [2011-04-13 10:20 +1000]: > > * They come with quilt patches pre-applied in the source, which is > >not only horribly confusing and error prone, but also breaks > >merge-upstream pretty thoroughly. > I hadn't noticed that. The seems like absolutely the wrong behaviour. > Ca

Re: [Oneiric-Topic] Packaging branches

2011-04-12 Thread Robert Ancell
On 04/12/2011 06:34 PM, Martin Pitt wrote: > Robert Ancell [2011-04-11 10:36 +1000]: >> - People are often ignoring the branches and uploading directly (or >> forgetting do a bzr push) which means changes are sometimes dropped by >> accident >> - People often do merge requests to lp:ubuntu/package_

Re: [Oneiric-Topic] Packaging branches

2011-04-12 Thread Robert Ancell
On 04/12/2011 03:09 AM, Sebastien Bacher wrote: > Le lundi 11 avril 2011 à 10:36 +1000, Robert Ancell a écrit : >> So, I propose that we move all the current packaging branches to using >> lp:ubuntu/package_name branches. We have a few branches using this >> mode and have had good success with the

Re: [Oneiric-Topic] Packaging branches

2011-04-12 Thread Robert Ancell
On 04/12/2011 01:55 AM, James Westby wrote: > On Mon, 11 Apr 2011 10:36:51 +1000, Robert Ancell > wrote: >> Some issues that will remain: >> - It is possible to screw up the branches so that bzr merge-package >> throws a confusing error (I keep doing it). Perhaps we need some hooks >> in bzr to

Re: [Oneiric-Topic] Packaging branches

2011-04-12 Thread Martin Pitt
Mathieu Trudel-Lapierre [2011-04-12 0:28 -0400]: > bzr merge-package sounds like one place where using packaging branches > in merge-mode would break too, no, seeing as the debian packages are > in normal-mode branches? Right, this is one use case where the auto-imports work better, as the Debian

Re: [Oneiric-Topic] Packaging branches

2011-04-12 Thread Martin Pitt
Robert Ancell [2011-04-11 10:36 +1000]: > - People are often ignoring the branches and uploading directly (or > forgetting do a bzr push) which means changes are sometimes dropped by > accident > - People often do merge requests to lp:ubuntu/package_name, even when > there is a packaging branch I

Re: [Oneiric-Topic] Packaging branches

2011-04-11 Thread Mathieu Trudel-Lapierre
Hi, Thought I might share insight as a relatively new contributor ;) [...] > My experience since moving to bzr branches: > - Much, much faster updating of packages > - Branching packages is possible (e.g. working in a PPA) > - Patches are a little bit harder to do, as the branch doesn't contain >

Re: [Oneiric-Topic] Packaging branches

2011-04-11 Thread Sebastien Bacher
Le lundi 11 avril 2011 à 10:36 +1000, Robert Ancell a écrit : > So, I propose that we move all the current packaging branches to using > lp:ubuntu/package_name branches. We have a few branches using this > mode and have had good success with them. Hi, I don't think the situation with those chan

Re: [Oneiric-Topic] Packaging branches

2011-04-11 Thread James Westby
On Mon, 11 Apr 2011 10:36:51 +1000, Robert Ancell wrote: > Some issues that will remain: > - It is possible to screw up the branches so that bzr merge-package > throws a confusing error (I keep doing it). Perhaps we need some hooks > in bzr to stop this from occurring. If it can be broken, it w

[Oneiric-Topic] Packaging branches

2011-04-10 Thread Robert Ancell
We currently maintain most Ubuntu Desktop packages in bzr branches and use bzr-builddeb in merge mode [1] with packaging stored in lp:~ubuntu-desktop/package_name/ubuntu. The other option was to use normal mode [2], but this was not chosen at the time due to the size of checkouts. My experience s