Re: Merging with Bazaar
On Tue, 2009-11-24 at 11:21 +1000, Ian Clatworthy wrote: > > If the HOWTO is small, putting it into the __init__.py docstring is > the > way to go. If it's larger, registering a help topic called > "builddeb-tutorial" might be better. See my separate RFC to the Bazaar > list about documenting plugins. I think its fine and appropriate for bzr help plugins/PLUGINNAME to show even quite extensive content. A tutorial can be fine as a separate doc too - no objections there, I just don't see a reason to split it simply to split it. Lastly, I'd consider bzr help builddeb/tutorial to be a bit of a nicer name, though only a bit. -Rob signature.asc Description: This is a digitally signed message part -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: Merging with Bazaar
James Westby wrote: > On Fri Nov 20 13:20:26 -0600 2009 Robert Collins wrote: >> As a first step, I'd fix 'bzr help plugins/builddeb' to contain your >> HOWTO, list of commands and other such things. > > Good point. If the HOWTO is small, putting it into the __init__.py docstring is the way to go. If it's larger, registering a help topic called "builddeb-tutorial" might be better. See my separate RFC to the Bazaar list about documenting plugins. Ian C. -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: Merging with Bazaar
On Fri Nov 20 13:20:26 -0600 2009 Robert Collins wrote: > As a first step, I'd fix 'bzr help plugins/builddeb' to contain your > HOWTO, list of commands and other such things. Good point. > Could merge upstream have version number guessing? It could, but I'm reluctant to do it badly :-) > I wonder if an import-* name makes more sense, as you can certainly > import-and-not-merge but you can't merge-without-importing. Well, the command does merge. We could add another command that just imported. I can see that there would be utility sometimes, but the workflow I had in mind does not require it. Thanks, James -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: Merging with Bazaar -- Missing import of binutils-avr 2.20-1 and -2
On Fri Nov 20 14:07:21 -0600 2009 Michael Hudson wrote: > James Westby wrote: > > I think that would be good too. Unfortunately it will require quite > > some work to allow people to trigger an import, as currently this requires > > shell access to a particular machine. > > Do you want to work on making this run much more like the code import > system? It seems like it would be a good idea, but quite a lot of work. That's one idea. We could do something fairly simple in terms of code, the issue is more that we would have to do something like run a django app on this machine or something, with all the requirements that has. If we need it then we can make it happen. There may be ways to make it unnecessary though. Thanks, James -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: Merging with Bazaar -- Missing import of binutils-avr 2.20-1 and -2
James Westby wrote: > On Thu Nov 19 01:08:00 -0600 2009 Robert Collins wrote: >> I think it would be good to have a team of folk able to nudge things >> along, rather than bottlenecking on one person. > > I think that would be good too. Unfortunately it will require quite > some work to allow people to trigger an import, as currently this requires > shell access to a particular machine. Do you want to work on making this run much more like the code import system? It seems like it would be a good idea, but quite a lot of work. Maybe we can talk about this in January, if you make it to the sprint. Cheers, mwh -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: Merging with Bazaar
On Fri, 2009-11-20 at 07:22 -0600, James Westby wrote: > Thanks for trying this. The import-upstream command that you propose is > already available as merge-upstream (as a merge is being performed as > it includes the uupdate step). I know that there needs to be a wiki page > for this operation, but I'm interested in any other ideas you have for > ensuring that others don't miss this command. > > Also, it would be very valuable to me if you could retry the experiment > using merge-upstream and let me know your feedback. As a first step, I'd fix 'bzr help plugins/builddeb' to contain your HOWTO, list of commands and other such things. That is, put stuff in your package docstring. Could merge upstream have version number guessing? I wonder if an import-* name makes more sense, as you can certainly import-and-not-merge but you can't merge-without-importing. -Rob signature.asc Description: This is a digitally signed message part -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: Merging with Bazaar -- Missing import of binutils-avr 2.20-1 and -2
On Thu Nov 19 01:08:00 -0600 2009 Robert Collins wrote: > I think it would be good to have a team of folk able to nudge things > along, rather than bottlenecking on one person. I think that would be good too. Unfortunately it will require quite some work to allow people to trigger an import, as currently this requires shell access to a particular machine. Thanks, James -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: Merging with Bazaar
On Wed Nov 11 23:52:35 -0600 2009 Robert Collins wrote: > We've run an experiment here at the Bazaar/Launchpad Ubuntu-focused > bazaar sprint with bzr-builddeb and packaging. > > We updated (aiming to achieve an 'uupdate') using bzr builddeb. > > pristine-tar's data is stored in revision properties. What we ended up > doing was: > bzr branch lp:ubuntu/foo > uupdate > dch etc etc > bzr builddeb -S > bzr revert > bzr import-dsc > dput > > which made it all work. > > An import-upstream command would be lovely - so that we could do: > bzr branch lp:ubuntu/foo > bzr merge lp:foo > uupdate > bzr import-upstream (would tag a commit based on the current pending > merge (or on tip if there isn't a pending merge) and replace the pending > merge (or add one if there isn't one) with the imported tarball revid. > dch etc etc > debcommit > bzr builddeb -S > dput Hi, Thanks for trying this. The import-upstream command that you propose is already available as merge-upstream (as a merge is being performed as it includes the uupdate step). I know that there needs to be a wiki page for this operation, but I'm interested in any other ideas you have for ensuring that others don't miss this command. Also, it would be very valuable to me if you could retry the experiment using merge-upstream and let me know your feedback. Thanks, James -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: Merging with Bazaar -- Missing import of binutils-avr 2.20-1 and -2
On Thu, 2009-11-19 at 06:59 +, Max Bowsher wrote: > Another import needing a nudge from you - neither 2.20-1 or -2 have been > imported: I think it would be good to have a team of folk able to nudge things along, rather than bottlenecking on one person. -Rob signature.asc Description: This is a digitally signed message part -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: Merging with Bazaar -- Missing import of binutils-avr 2.20-1 and -2
Alessio Igor Bogani wrote: > Executing "bzr branch lp:ubuntu/binutils-avr" I correctly obtain the > Lucid copy of this package. Instead executing "bzr branch > lp:debian/sid/binutils-avr" I obtain the Lenny(!!!) copy of this package > (not the Sid copy as I requested!). So execute merge-package make no > sense. > > What I wrong? This is the auto-importer's fault, not yours. Hi James, Another import needing a nudge from you - neither 2.20-1 or -2 have been imported: https://edge.launchpad.net/debian/+source/binutils-avr/+publishinghistory Max. signature.asc Description: OpenPGP digital signature -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
Re: Merging with Bazaar
Hi All, Apologize for my very bad English and sorry to bother you. I carefully followed this very interesting thread about merging (from Debian) with Bazaar. I have tried to merge a package with Bazaar to see how it work but I incur in a problem. Executing "bzr branch lp:ubuntu/binutils-avr" I correctly obtain the Lucid copy of this package. Instead executing "bzr branch lp:debian/sid/binutils-avr" I obtain the Lenny(!!!) copy of this package (not the Sid copy as I requested!). So execute merge-package make no sense. What I wrong? Thanks in advance. Ciao, Alessio -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
