Re: Feedback on merging via bzr
On 28 January 2010 06:14, Reinhard Tartler siret...@ubuntu.com wrote: On Do, Jan 28, 2010 at 00:06:52 (CET), Andrew SB wrote: On Sun, Jan 24, 2010 at 9:21 PM, James Westby jw+deb...@jameswestby.net wrote: I would love to have something more akin to grab-merge, and again I would be happy to help someone work on this. I would suggest it get added to bzr-builddeb as that will make some things easier. Here's a quick attempt: https://code.edge.launchpad.net/~andrewsomething/bzr-builddeb/bzr-grab-merge Purpose: Grab packaging branchs for merging. Usage: bzr grab-merge PACKAGE Description: This initiates a shared repository and then grabs both lp:ubuntu/package and lp:debian/package. Next, these branches are merged in ./package/working_tree. Mostly I'm hoping that the ugliness of my code (I'm really just a packaging monkey) will scare someone who knows better into stepping up. =) I didn't implement any changelog handling as that seems to be in-progress elsewhere. I suppose the real question here is exactly what features we want this to have. Do we want to generate diffs like the current grab-merge? Do we feel the need to write a REPORT-like file locally? I think a 'bzr st -rbranch:../debian' and 'bzr st -rbranch:../ubuntu' would be indeed interesting to have in REPORT. it would be great if grab-merge could additionally - check the freshness of the import branches - download the orig.tar.gz/orig.tar.bz2 files from debian The branches are pristine-tar enabled you can just $ bzr bd them and a tarball will appear in your tarball's directory. Perhaps bzr help grab-merge should give recipes for the common diffs that we want instead of actually generating them? Yes, that would espc. help people less familiar with bzr. That's documented already in the Distributed Development wiki. See tips section [1] I did a similar script which just creates a bunch of shared repos and pulls debian ubuntu branches [2] It doesn't attempt to merge it's just there to grab a few merges in one go. To be fair the UDD wiki needs some love from people who used bzr for development. [1] https://wiki.ubuntu.com/DistributedDevelopment/Documentation/Merging [2] http://people.ubuntuwire.org/~lucas/grab-branches.sh -- With best regards Dmitrijs Ledkovs (for short Dima), Ледков Дмитрий Юрьевич () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments -- 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
Pidgin trunk now available on Launchpad
I've created a trunk mirror of the Pidgin (Monotone) repository today using bzr-fastimport. I've uploaded it to https://code.edge.launchpad.net/~ian-clatworthy/pidgin/trunk. BTW, Pidgin is the only package in the hottest100 which is managed in Monotone. It's in the top 10 though so I felt it was worth the effort to upload an import. I've contacted the owner of the Pidgin Developers team asking if this ought to be made the development focus branch. If so, I'll take a look at what's involved to keep this branch up to date. 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: Feedback on merging via bzr
On 28 January 2010 10:09, Reinhard Tartler siret...@ubuntu.com wrote: On Do, Jan 28, 2010 at 11:01:37 (CET), Dmitrijs Ledkovs wrote: it would be great if grab-merge could additionally - check the freshness of the import branches - download the orig.tar.gz/orig.tar.bz2 files from debian The branches are pristine-tar enabled you can just $ bzr bd them and a tarball will appear in your tarball's directory. I expected that as well, but it didn't work with the xine-lib package. I think it's a bug. Was it you who added .bzr-builddeb folder with Native config? IMHO that shouldn't be in there. And for example revision 36 of the lp:ubuntu/xine-lib reconstructs original tarball just fine and builds fine. You can try $bzr bd -r36 lp:ubuntu/xine-lib At some point branch got the .bzr-builddeb folder with native package option. Since then the orig-tarballs where not imported using pristine-tar. Investigate further and file a bug against bzr-builddeb or udd porojects on launchpad. Perhaps bzr help grab-merge should give recipes for the common diffs that we want instead of actually generating them? Yes, that would espc. help people less familiar with bzr. That's documented already in the Distributed Development wiki. See tips section [1] which requires developers to open up yet another tool. Having the documentation at hand improves the workflow espc. when the wiki is down or you don't have a decently fast internet connection. Fair enough =) then it should probably live in the bzr builddeb plugin as one of the help topics. Cause you need it to work UDD style with packages anyway ;-) I did a similar script which just creates a bunch of shared repos and pulls debian ubuntu branches [2] It doesn't attempt to merge it's just there to grab a few merges in one go. Sounds interesting, I'll have a look. To be fair the UDD wiki needs some love from people who used bzr for development. indeed. -- With best regards Dmitrijs Ledkovs (for short Dima), Ледков Дмитрий Юрьевич () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments -- 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: Feedback on merging via bzr
On 28 January 2010 06:14, Reinhard Tartler siret...@ubuntu.com wrote: ... Â - download the orig.tar.gz/orig.tar.bz2 files from debian The branches are pristine-tar enabled you can just $ bzr bd them and a tarball will appear in your tarball's directory. Right, but which tarball? It's not always obvious. It's important that we md5sum match Debian [1]. In cases where we don't we end up having to do fake syncs once the differences between Debian and Ubuntu are resolved. Scott K [1] https://bugs.launchpad.net/ubuntu/+source/bzr-builddeb/+bug/510312 -- 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: Feedback on merging via bzr
On 28 January 2010 12:04, Scott Kitterman ubu...@kitterman.com wrote: On 28 January 2010 06:14, Reinhard Tartler siret...@ubuntu.com wrote: ... Â - download the orig.tar.gz/orig.tar.bz2 files from debian The branches are pristine-tar enabled you can just $ bzr bd them and a tarball will appear in your tarball's directory. Right, but which tarball? It's not always obvious. It's important that we md5sum match Debian [1]. In cases where we don't we end up having to do fake syncs once the differences between Debian and Ubuntu are resolved. Well just pick your favorite package branch and inspect it with $bzr visualise or the kde equivalent. The import is quite good. Original tarballs are taken from debian and are imported using pristine-tar into the upstream branch nick. Then the debian packaging is done on the debian branch nick which has upstream as ancestor and then the ubuntu is another branch nick which is diverging from the debian one again. So from the resulting lp:ubuntu/package you can branch off any upstream release, debian or ubuntu package release. And each revision has the corresponding pristine-tarball delta, such that all tarballs can be regenerated with identical checksums as in the debian archive. So the branch import has been engineered really well in this respect and we should not have fake syncs anymore. This even scales to when the branches will get rebased ontop of the upstream releases, cause the pristine-tarball delta will be committed into a new branch nick based off upstream branch adding all the Makefile.in's and etc with the tarball delta. Can't remember either Karmic or Jaunty UDS had a video on this UDD master plan with all the explanations. -- With best regards Dmitrijs Ledkovs (for short Dima), Ледков Дмитрий Юрьевич () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments -- 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: Feedback on merging via bzr
On 28 January 2010 12:04, Scott Kitterman ubu...@kitterman.com wrote: On 28 January 2010 06:14, Reinhard Tartler siret...@ubuntu.com wrote: ... Ã - download the orig.tar.gz/orig.tar.bz2 files from debian The branches are pristine-tar enabled you can just $ bzr bd them and a tarball will appear in your tarball's directory. Right, but which tarball? Â It's not always obvious. Â It's important that we md5sum match Debian [1]. Â In cases where we don't we end up having to do fake syncs once the differences between Debian and Ubuntu are resolved. Well just pick your favorite package branch and inspect it with $bzr visualise or the kde equivalent. The import is quite good. Original tarballs are taken from debian and are imported using pristine-tar into the upstream branch nick. Then the debian packaging is done on the debian branch nick which has upstream as ancestor and then the ubuntu is another branch nick which is diverging from the debian one again. So from the resulting lp:ubuntu/package you can branch off any upstream release, debian or ubuntu package release. And each revision has the corresponding pristine-tarball delta, such that all tarballs can be regenerated with identical checksums as in the debian archive. So the branch import has been engineered really well in this respect and we should not have fake syncs anymore. This even scales to when the branches will get rebased ontop of the upstream releases, cause the pristine-tarball delta will be committed into a new branch nick based off upstream branch adding all the Makefile.in's and etc with the tarball delta. Can't remember either Karmic or Jaunty UDS had a video on this UDD master plan with all the explanations. Then maybe the description of what is happening just needs to be improved because as I said in the bug, it sure appears to be looking upstream and getting the tarball from there before it checks Debian. I understand the theory, it isn't clear to me that's what's happening. Scott K -- 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: Where to see the list of merges/uploads that need review?
On Thu, Jan 28, 2010 at 5:46 PM, Michael Bienia mich...@bienia.de wrote: I know of https://code.edge.launchpad.net/~ubuntu-branches/+activereviews https://code.edge.launchpad.net/~ubuntu-main-sponsors/+activereviews https://code.edge.launchpad.net/~ubuntu-universe-sponsors/+activereviews Very handy, thanks! I could swear I tried manually typing in one of those before to see if a page existed but wasn't linked, but I failed to find it. I'll definitely bookmark these. Ouch, I see some branches waiting in there for 3 months already. I wonder who is reponsible for marking merge proposals as rejected? Until all get used to the new bzr merges, I still file bugs for my merge proposals to be on the safe side. As http://qa.ubuntu.com/reports/sponsoring/index.html lists only bugs awaiting sponsoring, a merge proposal without a matching bug might get lost. OK, this seems reasonable. Turns out there was a bug requesting this merge anyway, so I've now subscribed the sponsors team to that bug. Thanks for your help :) -- Elliot Murphy | https://launchpad.net/~statik/ -- 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
