ARM IRC Meeting Reminder
Hi, Every Thursday at 15:00 UTC. We'll be having the usual IRC meeting on #ubuntu-meeting, on Thursday 2011-02-24 at 15:00 UTC. The meeting agenda is available here: https://wiki.ubuntu.com/MobileTeam/Meeting/2011/20110224 The meeting history page with links to prior meetings is at: http://wiki.ubuntu.com/MobileTeam/Meeting Thank you, Michael -- ubuntu-devel mailing list ubuntu-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel
Re: build-from-branch into the primary archive
On Tue, Feb 22, 2011 at 09:39:13PM +0100, Martin Pitt wrote: > Martin Pool [2011-02-21 16:17 +1100]: > > It seems like 'mark-uploaded' is causing a certain amount of friction > > at the moment: cases where it's not run and the branch therefore gets > > out of sync with the upload, and also just that it's an additional > > step that weighs people down. > > Right now, debcommit -r already does what mark-uploaded does; is there > a reason why debcommit -r couldn't also (or instead) call bzr > mark-uploaded? 'debcommit -r' is already a superset of 'bzr mark-uploaded'. The latter just sets a tag corresponding to the head version in debian/changelog. -- Colin Watson [cjwat...@ubuntu.com] -- ubuntu-devel mailing list ubuntu-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel
Re: build-from-branch into the primary archive
On Thu, Feb 17, 2011 at 03:03:08PM -0500, Barry Warsaw wrote: > On Feb 17, 2011, at 10:33 AM, Steve Langasek wrote: > > How do we distinguish commits that ought to be built from those that > > don't? One way is to say we'll rebuild on things that add a new debian > > changelog (with a higher version.) Some people commit changes with a > > series target of 'unreleased' and we could then just actually assemble the > > package when that flips to be a real series. > > > >Either there needs to be a separate adjunct branch that gets pushed to > >*from* lp:ubuntu/$package to trigger builds, or this needs to only build > >when a new version (previously unknown to the archive) has been tagged on > >the branch. A lot of time has been spent on socializing the idea that we > >can use the existing lp:ubuntu branches to stage changes, and upload to the > >archive for building only when we're ready; to have some branches diverge > >from this behavior and start building for the archive for each commit, even > >if someone has nominated the branch in question for some sort of whitelist, > >would result in a number of wrongly published packages. > > > >I think the 'bzr mark-uploaded' interface, which sets the appropriate > >version tag, is the natural fit for this. > > Observing my recent use, I think there are two things that together indicate > that a particular source branch revision is ready to be uploaded. First, the > changelog entry's series is correct (i.e. natty, -proposed, etc.), *and* the > version number does not have a ~ in it. I'm with others on this who find tagging a more explicit and safer interface. ~ in changelogs isn't going to be a sufficient heuristic: $ grep-aptavail -FVersion \~ -nsPackage | wc -l 1386 Even if you exclude cases where ~ is part of the upstream version (a common way to indicate a pre-release): $ grep-aptavail -rFVersion '.*-.*\~' -nsPackage | wc -l 39 ~ was introduced so that it could be used in real versions in the archive - it wasn't meant as just an unreleased marker. Cheers, -- Colin Watson [cjwat...@ubuntu.com] -- ubuntu-devel mailing list ubuntu-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel
Re: build-from-branch into the primary archive
On 02/23/2011 04:31 PM, Barry Warsaw wrote: > On Feb 23, 2011, at 01:24 AM, Micah Gersten wrote: > >> Couldn't bzr import-dsc have helped here? > Probably so. In this specific case, I was making other changes so it was just > as easy to merge the branch and continue working. But I probably should have > been more diligent and merged the dsc for the uploaded version first. > > Cheers, > -Barry > You could have branched at the original revision, merge the dsc, then rebase your new changes on top of the dsc version :) Micah -- ubuntu-devel mailing list ubuntu-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel
Re: build-from-branch into the primary archive
On Feb 23, 2011, at 09:15 PM, Robert Collins wrote: >On Wed, Feb 23, 2011 at 8:03 PM, Martin Pitt wrote: >> Barry Warsaw [2011-02-22 17:22 -0500]: >>> That's definitely a problem. :) Because of the team nature of Ubuntu >>> development, I think in general uploaders should have push rights to the UDD >>> branches. >> >> They do already. computer-janitor uses a custom branch, though, which >> is owned by ~computer-janitor-hackers. I. e. people who can upload the >> package can't commit to the branch. > >You could bless that branch as the UDD branch, then package upload >rights will let people push to the branch. Which branch specifically, and how to "bless" it? debian/control contains: Vcs-Bzr: http://bazaar.launchpad.net/%7Ecomputer-janitor-hackers/computer-janitor/trunk bzr info on the trunk branch says: bzr+ssh://bazaar.launchpad.net/%2Bbranch/computer-janitor/ -Barry signature.asc Description: PGP signature -- ubuntu-devel mailing list ubuntu-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel
Re: build-from-branch into the primary archive
On Feb 23, 2011, at 01:24 AM, Micah Gersten wrote: >Couldn't bzr import-dsc have helped here? Probably so. In this specific case, I was making other changes so it was just as easy to merge the branch and continue working. But I probably should have been more diligent and merged the dsc for the uploaded version first. Cheers, -Barry signature.asc Description: PGP signature -- ubuntu-devel mailing list ubuntu-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel
Re: build-from-branch into the primary archive
On Feb 23, 2011, at 08:03 AM, Martin Pitt wrote: >Barry Warsaw [2011-02-22 17:22 -0500]: >> That's definitely a problem. :) Because of the team nature of Ubuntu >> development, I think in general uploaders should have push rights to the UDD >> branches. > >They do already. computer-janitor uses a custom branch, though, which >is owned by ~computer-janitor-hackers. I. e. people who can upload the >package can't commit to the branch. Ah right. Actually mvo will have to add ~ubuntu-dev to that team since he's the only administrator. -Barry signature.asc Description: PGP signature -- ubuntu-devel mailing list ubuntu-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel
Re: build-from-branch into the primary archive
On Wed, Feb 23, 2011 at 8:03 PM, Martin Pitt wrote: > Barry Warsaw [2011-02-22 17:22 -0500]: >> That's definitely a problem. :) Because of the team nature of Ubuntu >> development, I think in general uploaders should have push rights to the UDD >> branches. > > They do already. computer-janitor uses a custom branch, though, which > is owned by ~computer-janitor-hackers. I. e. people who can upload the > package can't commit to the branch. You could bless that branch as the UDD branch, then package upload rights will let people push to the branch. -- ubuntu-devel mailing list ubuntu-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel -- ubuntu-devel mailing list ubuntu-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel
Re: build-from-branch into the primary archive
On Wed, Feb 23, 2011 at 8:03 PM, Martin Pitt wrote: > Barry Warsaw [2011-02-22 17:22 -0500]: >> That's definitely a problem. :) Because of the team nature of Ubuntu >> development, I think in general uploaders should have push rights to the UDD >> branches. > > They do already. computer-janitor uses a custom branch, though, which > is owned by ~computer-janitor-hackers. I. e. people who can upload the > package can't commit to the branch. You could bless that branch as the UDD branch, then package upload rights will let people push to the branch. -- ubuntu-devel mailing list ubuntu-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel
