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