[00:12] <mtaylor> jelmer, bob2: aaaaah... I think that this all be my fault.
[00:12] <mtaylor> I've been building with -rsudo in my .devscripts
[00:13] <mtaylor> instead of -rfakeroot
[00:14] <jelmer> ahh, that would explain it (-:
[00:17] <mtaylor> yup. that was it. I fixed that and all is now well.
[00:18] <mtaylor> stupid root privileges
[00:49] <jdrake> I have just registered a project on launchpad, and I am trying to figure out how to push the code I have just imported into it. I am not seeing any documentation  that leads me in the right direction.
[00:51] <Peng> You could register a branch on LP.
[00:51] <fullermd> Actually, I thought you pretty much just pushed, and it created it on the fly.
[00:52] <jdrake> It appears /~username/Project/trunk  will work
[01:03] <ddaa> jdrake: https://help.launchpad.net/FeatureHighlights/EasyBranching
[03:11] <dlee> Easiest way to submit minor typo corrections to Bza docs?  And thanks MUCH for this tool...I'm trying to talk my company into using it instead of CVS or SVN.
[03:12] <dlee> Lol... and I type Bza for Bzr while asking how to fix typos... :P
[03:13] <Kamping_Kaiser> at a guess file a bug in launchpad. someone may have a better idea though
[03:16] <Peng> I always just send a patch to the mailing list.
[03:16] <Peng> (bundle)
[06:33] <Peng> WTF?
[06:34] <Peng> I have a "bzr push" from the 25th using 100% of one CPU core.
[06:34]  * Peng hits Ctrl+C.
[06:34] <Peng> real    3892m35.171s
[06:34] <Peng> user    296m58.803s
[06:34] <Peng> sys     3575m18.538s
[06:34] <Peng> :)
[06:35] <Peng> I see a push in .bzr.log. The last thing logged is "ssh implementation is OpenSSH".
[06:36] <Peng> Remote probably got killed.
[06:36] <Peng> while autopacking.
[06:36] <Peng> Why exactly is that an excuse to deadlock?
[06:36] <Kamping_Kaiser> nice
[07:51] <lifeless> eek
[09:41] <Peng> Huh, the packs autopack combined weren't all in chronological order. It left some behind.
[09:41] <Peng> It combined the 60 MB pack, but not the 70 KB one. :\
[09:41] <Peng> Since this was over SFTP, that's very nice...
[09:46] <lifeless> is the 70kb pack in the pack-names file?
[09:48] <Peng> Yes.
[09:48] <Peng> 9 packs, 9 listed in pack-names. I didn't check if they are correct, except for that one..
[09:49] <lifeless> k
[09:50] <lifeless> night
[09:50] <Peng> ...Night.
[11:31] <blauwal> join #oooscm
[16:18] <Verterok> moin
[16:55] <sabdfl> howdy
[16:57] <jelmer> Hi Verterok, sabdfl
[16:59] <sabdfl> hey jelmer, compliments of the season to you
[17:01] <jelmer> sabdfl: Thank you, and likewise :-)
[17:03] <Verterok> hi jelmer
[18:29] <aadis> anyone having luck with trac-bzr?
[18:35] <Verterok> aadis: which branch are you using?
[18:35] <aadis> there are so many
[18:35] <aadis> can you recommend one?
[18:37] <aadis> i get this: TypeError: can't compare datetime.datetime to float
[18:38] <Verterok> aadis: try with tim hatch branch
[18:38] <Verterok> aadis: which version of trac?
[18:38] <aadis> 0.11dev
[18:39] <aadis> 0.11b1
[18:39] <Verterok> yes, tim hatch branch is ok
[18:39] <aadis> okies.
[18:40] <Verterok> it should work with a small change in backend.py
[18:40] <aadis> Verterok: http://timhatch.com/projects/trac-bzr/ right?
[18:41] <Verterok> let me check
[18:41] <radix> ah, when distributed development goes wrong :P
[18:42] <Verterok> aadis: https://code.launchpad.net/~timhatch/trac-bzr/thatch-dev
[18:42] <aadis> radix: heh, i can almost see some of the problems.
[18:42] <aadis> there must be, what, 10 branches of trac-bzr, and no way to figure out which works
[18:43] <foom> hm, trac-bzr...anyone have a running instance they can point me to?
[18:43] <radix> http://bazaar-vcs.org/TracBzr has some links
[18:43] <foom> thanks
[18:43] <Verterok> foom: I have an outdated trac-bzr running with trac-0.10 at: https://trac.steppenwolf.selfip.net/bzr-eclipse/
[18:44] <foom> no branch support?
[18:45] <radix> apparently aaron bentley's version supports multiple branches
[18:45] <radix> but I don't know where there's an example
[18:45] <Verterok> aadis: once you get the code, in backend.py add/define a top level/global variable: version = '0.2'
[18:46] <aadis> okies
[18:46] <Verterok> radix, foom: I think marienz-dev branch also supports branches
[18:47] <foom> i'm not gonna install any, I just want to see one someone else has. :)
[18:47] <Verterok> an exmample here: http://www.pkgcore.org/trac/pkgcore/wiki/Branches
[18:47] <aadis> Verterok: thanks! :)
[18:47] <foom> ah, thanks.
[18:48] <Verterok> aadis: np ;-)
[18:50] <dato> hm, is it me or james_w hasn't been around for a while?
[18:55] <aadis> Verterok: and it works! mucho gracias.
[18:55] <aadis> it was a pain to see the latest commits otherwise
[18:57] <Verterok> aadis: great! de nada ;-)
[19:00] <aadis> though trying to view a changeset says this: TypeError: format_to_html() takes at least 3 arguments (2 given)
[19:03] <Verterok> ups, that is a new one :P
[19:04] <aadis> looking into it
[19:05] <aadis> Verterok: turning off property renderer works, since the block is inside "if has_property_renderer". so that's a workaround.
[19:06] <Verterok> nice, at least it's working :-P
[19:06] <aadis> indeed!
[19:07]  * Verterok thinks that maybe it's time to start filling bug reports against trac-bzr 
[19:09] <BasicOSX> grrr
[19:09] <BasicOSX> Colloquy crashed
[20:06] <Verterok> seeya guys, I'm leaving for the weekend.
[20:09] <aadis> BasicOSX: was it after a suspend on leopard? I see colloquy doing that when i come back from suspend
[20:14] <BasicOSX> yes
[21:55] <elmo> if I have a master tree, now at r990.  and someone has a branch at 980 or so, which they then made 3 changes to.  how do I see just those diffs?
[21:55] <elmo> bzr missing --theirs-only kinda does the right thing, except without the diff part
[21:56] <fullermd> You probably want a construct like -rancestor:their/branch..branch:their/branch
[21:56] <jelmer> One way would be bzr diff -r980.. in "their" branch would probably work
[21:56] <fullermd> Easier would be to go into a copy of theirs and -rancestor:yours..
[21:58] <luks> bzr diff /path/to/branch1 /path/to/branch2
[21:58] <luks> but I think this doesn't work with bzr.dev anymore
[21:58] <elmo> luks: that definitely doesn't work
[21:58] <elmo> fullermd: yours seems good
[21:58] <luks> it should in 1.0
[21:58] <fullermd> Well, it "works", but it doesn't show what he wants.
[21:58] <elmo> oh, I'm in 0.92 or something, it's some random Debian box running something from 1999
[21:59] <fullermd> Oh, so it's the Debian bleeding edge?   ;>
[21:59] <luks> oh, right, I misread the question
[21:59] <luks> I'd personally just do `bzr send -o- | less` :)
[22:00] <elmo> oh, yay, we have bzr diff -c now \o/ thank you whoever implemented that
[22:05] <fullermd> Absolutely.  It's such a small thing, but it makes it SO much easier to step around...
[22:06] <dato> +1
[22:08] <dato> though I wrote myself in the early days a plugin to make -r X work like -c X works now, and now I can't teach my fingers to type -c instead of -r :(
[22:15] <mtaylor> jelmer: feature request for bzr-svn... if I'm doing an svn-import, and it gets interrupted and I have to restart it, is there any way it can pick up where it left off?
[22:15] <mtaylor> jelmer: I'm doing an import over the wire of 8394 revs, which took 3 hours to get to 5536... at which point the network went away :(
[22:15] <mtaylor> jelmer: OH
[22:15] <mtaylor> hey, look at that
[22:16] <mtaylor> jelmer: nevermind... it's already doing that. you ROCK
[22:16] <fullermd> He's real quick with those feature requests   ;)
[23:01] <mtaylor> no kidding
[23:12] <jelmer> mtaylor: (-: