=== wedgwood is now known as wedgwood_away === r0bby_ is now known as robbyoconnor === mmrazik is now known as mmrazik|otp [10:21] Huh.. I didn't know Martin Pool now works at Google. [10:21] I should say hi :) === mmrazik|otp is now known as mmrazik [11:30] LeoNerd: you're at Google too? [11:30] it's a black hole... [11:30] endlessly sucking [11:31] mgz! [11:31] jemler! [11:31] ...tyop! [11:31] Yah [11:32] It's not the sucking that gets you, it's the tides. [11:38] fullermd: perhaps tis teh typsos ? :P [11:39] LeoNerd: same here, based in the UK [11:39] Oh.. huh... I should come say hi then. Me too [11:40] I'm jelmer@ [11:40] this is where you both turn around and go, "there you are"? [11:41] That's why google keeps 'em chained to their desks; not enough slack to turn around. [11:46] Oh, there you are ? :) [11:47] LeoNerd: we're in shouting distance of each other :) [11:48] spiv: thx for looking. What really happened was not even a rename, but a simple conflict resolution (that happened bad (maybe similar to add/add in git)) [11:49] spiv: I still haven't got it to understand that it is the same file in revision 38: http://bazaar.launchpad.net/~mariusko/charms/precise/node-app/trunk/changes [11:51] Probably would worked better then if one of the feature branch was based on the other [11:54] mariusko: Having both branches share history will certainly avoid the file-id conflicts [11:55] mariusko: you won't be able to make bzr understand that two file-ids are really the same file, but you can teach it to chose which one you want to track [11:57] hmpf, X server crash.., lovely [12:01] ex-server crash? :p [12:03] the X server is now an ex-X server? [12:03] It's not crashed, it's resting. [12:05] Of course, if he shut it down now, it would be an ex ex X server, and he could make a few bucks off it. [12:06] let's see [12:06] haha [12:12] Sorry, the program "Xorg" closed unexpectedly [12:13] Your computer does not have enough free memory to automatically analyze the problem and send a report to the developers. [12:15] See what happens when you run emacs? [12:17] hehehe === quicksil1er is now known as quicksilver === mmrazik is now known as mmrazik|afk === wedgwood_away is now known as wedgwood [15:16] hello, I've done git-import on a repo and now I have empty directory with just .bzr. bzr branches report some branches but I don't know how to get to them [15:26] bzr checkout . [15:26] CcxCZ_: ^ [15:26] note the '.' [15:29] I don't want the default branch though [15:48] CcxCZ_: does git-import give you colocated branches, i.e., bzr checkout co:branch ? [15:48] where branch is the branchname [15:51] possibly, it used to use directory per branch [15:52] how do I address colocated branches? === mmrazik|afk is now known as mmrazik [16:14] CcxCZ_: git-import shouldn't create colocated branches by default. did you use --colocated? [16:14] (or are you perhaps using an older version that does?) [16:31] not sure about version tbh [16:32] ccxCZ: does 'bzr branches' list a number of branches? [16:32] if so, then you are probably using a set of colocated branches [16:33] it's probably better to avoid that, since the UI support for colocated branches is still fairly limited [16:35] ok. I guess it would be best to upgrade and re-import then [16:36] * ccxCZ resolved it in raw git in the meantime [17:04] jelmer: bzr branch https://code.google.com/p/selenium trunk [17:04] bzr: ERROR: exceptions.KeyError: '2fabdeb9fad1cf7e41c129b65dc98f94cd711ba3' [17:05] vila: that's a known issue, though there isn't an obvious fix IIRC [17:05] jelmer: is there some hope to get that working or is that a known and... hehe, great answer as expected ;) [17:05] jelmer: the repo seems to have been svn -> git migrated IIUC [17:06] vila: that shouldn't matter, there are issues with bzr-git branching from google code IIRC [17:06] https://bugs.launchpad.net/bzr-git/+bug/878085 looks possibly relevant [17:06] Launchpad bug 878085 in Launchpad itself "NoSuchRevision error during git import" [High,Triaged] [17:12] jelmer: oh, you mean that if I start with a local 'git clone' I will then be able to 'bzr branch' ? [17:20] vila: actually, that might indeed work [17:22] * vila tries [17:22] err [17:22] * vila try ? [17:23] "vila tries" is correct, I think [17:24] jelmer: thanks ;) [17:25] vila is very trying [17:33] mgz: don't be trite ;) [17:35] :D [17:46] spiv: hey ! [17:47] mgz, spiv : Can I have subtitles ? (not http://www.youtube.com/watch?v=R3Yi-t2w_gI) ;) [17:52] jelmer: it worked [17:52] jelmer: so that's a bug between remote and local access right ? [17:55] vila: yeah [17:59] vila: it's an old joke of the sort teachers might make, on the meaning of "trying" as difficult or annoying :) [18:00] teacher - Why aren't you getting on with your work? pupil - I'm trying! teacher - Yes, you're very trying. [18:00] mgz: Oh, I think I get it ;) And "trite" is because it sort of rhymes ? [18:00] it's also 'try-' sounding yes [18:01] It's enough to make you cry. [18:11] fullermd is missing on out a wonderful career as a poet.. === mmrazik is now known as mmrazik|afk [18:17] I like to think of it as the rest of the world missing out on my wonderful career as a poet. [18:17] I'm not entirely sure I'll get universal agreement on that point though. [18:18] I think you would in particular do well as a "Sinterklaasgedichten"-poet, but I'm not sure how to explain that concept to somebody who is not Dutch. [18:19] Well, I know what "sinter" means when you apply it to metal. Sounds fitting to me ;p [18:20] I prefer to work in more dignified forms. Like, the other year as part of some mailing list thread, I wound up having to write a sonnet. About bologna. [18:21] The reception wasn't entirely what one might hope for, sadly. Obviously my compatriots had NO taste. [18:21] basically, if Santa (Sinterklaas) gives you a gift in the Netherlands he tends to accompany the gift with some sub-par poetry [18:21] ... in some way relating to you or your naughty activities over the last 12 months [18:22] fullermd: ah, tough crowd? [18:23] My genius is constantly underappreciated, sadly. I'm pretty sure it's a global conspiracy. [18:26] we appreciate it, just not too much, or you'd get big-headed === mmrazik|afk is now known as mmrazik [18:38] Hi, i am using bzr to get the source code for bugzilla under windows, now i have installed ubuntu and want that i can use the same checked out code while using bzr from ubuntu, can i do this? === deryck is now known as deryck[lunch] === deryck[lunch] is now known as deryck === _thumper_ is now known as thumper === thumper is now known as thumper-afk === wedgwood is now known as wedgwood_away === wedgwood_away is now known as wedgwood === wedgwood is now known as wedgwood_away [23:58] OK, so, yeah, qlog gets cranky pulling up a 300-some meg diff.