=== cjwatson1 is now known as cjwatson
[15:19] <evand> cjwatson: do you have a general workflow for converting Ubuntu source packages into a branch of the imported debian svn trunk?  My current plan wrt partman-crypto is to just redo each merge, assuming that everything will apply cleanly.
[15:20] <cjwatson> yeah, I do
[15:20] <cjwatson> first, create a branch using -rBASEREVISION (whatever the base revision we first branched from is)
[15:20] <cjwatson> unpack all the Ubuntu packages based off that Debian revision
[15:21] <cjwatson> for each Ubuntu package, cd into its tree, mv the .bzr directory over from the previous one (or from the initial branch, for the first one), add any unknown files, debcommit
[15:22] <cjwatson> at some point you may come to a point in the Ubuntu history where a new Debian revision was merged
[15:23] <cjwatson> the way you do that is: figure out the bzr revision in trunk corresponding to what we merged; in the tree corresponding to the Ubuntu version immediately before the change, 'bzr merge -rREVISION ../trunk'
[15:23] <cjwatson> you will get conflicts
[15:23] <cjwatson> but ignore them
[15:23] <cjwatson> unpack the new Ubuntu package, mv the .bzr directory over from the one you just merged and conflicted
[15:24] <cjwatson> the action of doing that resolves all the conflicts, so 'rm .bzr/checkout/conflicts'
[15:24] <cjwatson> add any unknown files and commit
[15:24] <cjwatson> and just repeat all that until you get to the end
[15:24] <evand> wow, that probably saved me a massive headache.  Thanks!
[15:25] <cjwatson> I haven't scripted it as such, but a few carefully-placed shell functions can get it down to just a couple of command lines per version
[15:25] <evand> ok
[15:26] <cjwatson> also, you might want to use debcommit for the merge, but by default it will include all the Debian changelog entries in the commit message as well, which I think is excessive
[15:27] <cjwatson> so I apply this to my /usr/bin/debcommit when I'm doing merges:
[15:27] <cjwatson>              or die "debcommit: cannot run $diffcmd[0]: $!\n";
[15:27] <cjwatson>          foreach (<CHLOG>) {
[15:27] <cjwatson> +            last if /^\+ -- /;
[15:27] <cjwatson>              next unless /^\+  /;
[15:27] <cjwatson>              s/^\+  //;
[15:27] <cjwatson>              next if /^\s*\[.*\]\s*$/; # maintainer name
[15:28] <evand> ah, ok
[17:30] <evand> cjwatson: http://people.ubuntu.com/~evand/upload/partman-crypto_22ubuntu1.dsc and http://people.ubuntu.com/~evand/bzr/partman-crypto/
[17:30] <evand> I think I did that correctly, but let me know if you spot any errors.
=== cjwatson_ is now known as cjwatson
[19:13] <cjwatson> evand: ack, enqueued
[19:13] <cjwatson> getting to the end of the road on the d-i import pain
[19:13] <cjwatson> will need to spend a while pushing it up to LP though
[19:16] <evand> nice, thanks
[19:22] <evand> I can imagine
[20:29] <cjwatson> dear bzr, please PUSH FASTER
[20:29] <cjwatson> then again it's probably my ADSL's fault
[20:32] <evand> haha
[20:33] <evand> yikes, I've played that game (IDSL, admittedly) and I'm *never* going back.
[20:33] <evand> cjwatson: https://bugs.launchpad.net/ubuntu/+source/ubiquity/+bug/70088 whenever you have a free moment, not a high priority
[20:43] <cjwatson> evand: /~kamion/debian-installer/main/ pushed again; if you have a branch of it, you'll need to pull --overwrite I'm afraid
[20:46] <cjwatson> evand: followed up to the bug
[20:50] <evand> just out of curiosity, why not ~core-dev?
[20:50] <evand> thanks
[20:57] <cjwatson> /main/ is a read-only import branch so I thought it was OK/best not to have it more generally writable, in case somebody makes a mistake
[20:58] <cjwatson> I'm pushing /ubuntu to core-dev
[20:58] <evand> gotcha
[21:07] <CIA-4> ubiquity: evand * r2362 ubiquity/ (3 files in 2 dirs):
[21:07] <CIA-4> ubiquity: * Removed the somewhat confusing reminder to remove the CD from the reboot
[21:07] <CIA-4> ubiquity:  dialog. Casper handles telling the user this at the right moment via
[21:07] <CIA-4> ubiquity:  a final usplash message. (LP: #70088)
=== ebel_ is now known as ebel
=== ebel_ is now known as ebel
=== ebel_ is now known as ebel