[01:40] <RenatoSilva> jelmer: hi
[02:27] <jelmer> RenatoSilva: hi
[02:28] <RenatoSilva> jelmer: hi. I've merge from trunk, tests passed ok. Just the diff a bit weird
[02:32] <jelmer> RenatoSilva: sorry, I think I miss context?
[02:33] <RenatoSilva> jelmer: sorry, https://code.launchpad.net/~renatosilva/bzr-email/mail-customization/+merge/68932
[02:39] <jelmer> RenatoSilva: ah, thanks
[02:39] <jelmer> I'll have a look tomorrow
[02:39] <RenatoSilva> ok thanks
[04:33] <aminpy> http://dpaste.com/575029/plain/ <- can anybody help me?
[04:51] <aminpy> how can I run this command -> bzr branch lp:openerp <- with ssh?
[05:06] <maxb> lp: Will automatically translate to ssh once you've set your launchpad username with "bzr lp-login"
[05:09] <aminpy> maxb, how can I set my launchpad username with ...?
[05:09] <aminpy> sorry I'm new in bzr
[05:10] <maxb> Run 'bzr help lp-login'
[05:23] <aminpy> maxb, I dont find anything, can you tell me what command should I use?
[07:42] <aminpy> http://dpaste.com/575126/plain/ <- can anybody help me?
[07:42] <spiv> aminpy: upgrade your bzr; there's a problem with an HTTP proxy, but upgrading bzr will avoid the issue.
[07:43] <spiv> (As a tangent, you probably don't need to be running bzr as root)
[07:47] <aminpy> spiv, how can I upgrade bzr in debian?
[07:48] <aminpy> spiv, my bzr version -> 2.1.2
[08:44] <vila> maxb: I just realized that 2.3.4 included the fix for NoFinalPath import failures
[08:45] <vila> maxb: All the involved packages had a pending lock (almost all of them in their updates/.../oneiric branch) which I broke
[08:45] <vila> maxb: I've requeued them all and they are processing right now
[08:48] <vila> maxb: gnome-orca succeeded \o/
[08:49] <vila> maxb: paramiko succeeded \o/
[08:53] <vila> maxb: some failed with AppendRev..Violation, so it's a net progress anyway ;)
[08:57] <vila> maxb: gwibber succeeded \o/
[08:57] <vila> I can enjoy my vacations now :)
[09:19] <AuroraBorealis> so, anyone know how to get bzr explorer working on lion?
[09:19] <AuroraBorealis> or...bzr in general
[10:25] <AuroraBorealis> https://bugs.launchpad.net/bzr-mac-installers/+bug/731391?comments=all fixes it if anyone is interested!
[10:26] <jelmer> hi AuroraBorealis
[10:27] <AuroraBorealis> hello.
[10:47] <jelmer> AuroraBorealis: have you tried the fix suggested by griker?
[10:49] <AuroraBorealis> i did.
[10:49] <AuroraBorealis> and it worked.
[10:52] <jelmer> AuroraBorealis: any chance you can mention that on the bug report?
[10:52] <jelmer> it seems like at least two people confirmed the issue and the fix, so I'll set the status back to confirmed
[10:52] <AuroraBorealis> yeah i'll do that
[10:52] <jelmer> I don't have a Mac OS X machine to verify, but hopefully this is enough info for d0xx to fix it.
[10:52] <AuroraBorealis> still not sure what the issue is (that the default python version is different then 2.6?)
[10:54] <AuroraBorealis> and just commented.
[10:55] <jelmer> AuroraBorealis: it seems that bzrlib is installed to the python2.6 directory, while bzr uses the default python
[10:55] <jelmer> and the default python has changed to python2.7 in lion
[10:56] <AuroraBorealis> ah
[15:09] <jimis> I have a huge diff that I want to commit little by little. Do you know of some tool to interactively pick the changes I want?
[15:10] <jelmer> jimis: you can shelve the changes you don't want and commit bits at a time ("bzr shelve") ?
[15:16] <jimis> jelmer: you mean apply the huge diff, shelve, and then unshelve selectively?
[15:17] <jimis> how would I do the last part?
[15:21] <jelmer> jimis: I'm not sure if you can selectively unshelve, I usually selectively shelve
[15:26] <jimis> jelmer: in that case can I commit only the shelved bits, ignoring working dir state?
[15:37] <jelmer> jimis: I don't think there is anything to do that at the moment
[15:41] <jimis> ok
[15:42] <jimis> I am now looking for some generic tool to cherry-pick changes from a diff
[15:42] <jimis> VCS-independant
[16:27] <LeoNerd> I wrote a tool for that at my first job.. A filter for a patch that outputs another patch. say yes/no per chunk.. It did some rewriting of line numbers too, to account for absent chunks
[16:27] <LeoNerd> Sadly I didn't get to keep it though
[16:28] <jelmer> jimis: perhaps there's something in diffutils
[16:47] <maxb> I find (insert your favourite editor here) and recountdiff do just fine
[18:02] <jimis> Is there a problem with launchpad vcs-imports?
[18:02] <jimis> lp:gcc hasn't been updated for some time now
[19:38] <jelmer> jimis: yes, it's being worked on
[19:38] <jelmer> hi mgz
[20:52] <vila> jimis: emacs diff-mode is the perfect match for the 'cherry-pick changes from a diff and VCS-independent'
[20:53] <vila> jimis: you can split hunks, kill one, apply/revert one, you name it, with or without saving intermediate states into files
[20:59] <jelmer> hey vila
[20:59] <jelmer> vila: shouldn't you be on holiday ? ;-)
[20:59] <vila> jelmer: ;) Don't tell my girlfriend she thinks I'm ....
[21:00] <jelmer> :)
[21:00] <vila> jelmer: I am, I just had a look on the NoFinalPath failures as a last juicy fruit ;)
[21:00] <vila> And on that: bye all !
[21:00] <jelmer> vila: Have a nice vacation!
[21:20] <luks> jelmer: ping
[21:23] <jelmer> luks: hi
[21:23] <jelmer> sorry, didn't realize you were still in here too
[21:23] <luks> jelmer: I'll merge the patch and move the project to ~bzr
[21:24] <jelmer> luks: thanks
[21:24] <luks> so that you guys have full access to it
[21:39] <maxb> jelmer: Hi, could you push your latest bzr-fastimport upload to alioth?
[21:48] <jelmer> maxb: done
[21:48] <maxb> Thanks
[21:48]  * maxb is reviewing recent Debian ACCEPTED emails for ~bzr ppa updates
[21:50] <jelmer> aha
[22:42] <lifeless> jelmer: I have to run, but for the lp patch, look at recipe manifests that capture the same data AFAICT
[22:46] <jelmer> lifeless: thanks for the review
[22:46] <jelmer> lifeless: that would be the SourceRecipeData table I think
[22:46] <jelmer> (which can capture the branch and revision data)
[23:15] <mgz> jelmer: I'm still mystified as to how you get the failure in the selftest-xfail-msg mp