[00:04] hi wgz [00:10] hey poolie === yofel_ is now known as yofel [07:37] hi alll ! [07:58] morning! [08:01] heya mgz [08:13] hi mgz, vila [08:14] shall we get this party started? [08:16] * vila nods [08:21] I created a thingy via the new cunning means described in a thread on the wotsit [08:25] jelmer: joining ? [08:27] vila: sorry, on my way [08:27] jelmer: no worries [08:46] hi [08:47] mgz, vila: can you look at the "what's new iun qbzr 0.22" and check this text for mistakes? http://bazaar.launchpad.net/~qbzr-dev/qbzr/trunk2a/view/head:/NEWS.txt [08:48] looking [08:51] seems good bialix [08:51] thank you, wgz [08:51] new hat? new clothes? [08:51] :-) [08:53] I need to dress up in two outfits at once :) [08:54] ninja [08:57] wgz: I'll release qbzr then [08:57] not sure what I can do for explorer right now [09:05] bialix: I want to still get some fixes in for explorer [10:32] can anyone help me with converting svn to bzr? currently I'm stuck at: bzr: ERROR: Unable to convert Subversion path e16/fnlib/fonts/fonts/shinymetal/45/\.tif because it contains characters invalid in Bazaar. [10:38] ccxCZ: that's a really hard thing to work around, bzr doesn't support backslashes in filenames at the moment [10:39] I guess that filename is there by mistake anyway and I certainly don't need the e16/ subtree [10:40] ccxCZ: you could dump the svn repository, remove the problematic filename and then import [10:41] can we import from svndump? [10:42] atm I have local copy of the repo obtained with svnsync, can I branch a subdir of that? [10:43] it uses /trunk/projectname layout and I need only few of these [10:56] ccxCZ: you can use a subdir, you just can't exclude a subdir [10:56] ccxCZ: "bzr branch" allows you to specify a path in the repo [10:58] ah got it to work now, thanks [11:35] jelmer: I branched out successfully and now I tried to pull new changes from the source on the net http://paste.pocoo.org/show/547220/ [11:46] I can svn co from that uri successfully; when I disable all plugins but svn it behaves the same [11:47] fileabug? [11:49] ccxCZ: you're running an old version f bzr-svn [11:51] should I try 1.1.2 or trunk? [11:51] 1.1.2 [11:55] seems to work now, thanks again [11:55] * ccxCZ should have checked for latest version himself [11:56] hmm but why is it checking out the whole history? [11:56] ccxCZ: it's just caching the revision metadata, not the contents of the revisions [11:57] server is too unstable to get all 6k commits in one session, that's why I used svnsync [11:57] seems I'll have to keep the sync version around for pulling then [11:57] 60k commits actually [12:01] that's one unhappy server :-( bzr: ERROR: A Subversion remote access command failed: REPORT of '/svn/e/!svn/bc/58596': Could not read response body: Connection reset by peer (http://svn.enlightenment.org) [12:02] okay, I'll make some scripts to update my repos from the svnsync copy then [12:13] man, lwn trolls pretty hard of riddell's post about kubuntu [12:13] *off [12:13] and it works, 32 comments already :) === Quintasan_ is now known as Quintasan [14:12] mgz: yeah that jono guy holds no punches :) [14:25] Riddell: all those people saying nice things about you too :) [14:25] I've had two job offers in the last hour :) [not wanting to take them] === verterok` is now known as verterok [17:59] I have two revisions numbered 1, local and remote, and the local is the "real" one. It was actually derived from the remote, but I wrestled with bzr and had to make a new repo with the old code. [17:59] How can I merge? I can't find anything about how to specify a "base revision" [18:00] what I have been trying: bzr merge lp:chaos2d --revision 1 [18:17] Jesdisciple: why not just `bzr merge lp:chaos2d`? [18:20] LarstiQ, $ bzr merge lp:chaos2d [18:20] Enter passphrase for key '/home/chris/.ssh/id_rsa': [18:20] bzr: ERROR: Branches have no common ancestor, and no merge base revision was specified. [18:20] Jesdisciple: aha [18:20] ended up finding the solution here http://selfdocumentingcode.blogspot.com/2009/04/merging-unrelated-branches-in-bazaar.html [18:21] Jesdisciple: right, that way you can get it done [18:22] Jesdisciple: but since you're just starting out [18:23] Jesdisciple: do you need the "old" one? [18:23] Jesdisciple: if not, you could maybe just replace it with the new one and go from there [18:23] nope [18:23] how...? [18:23] Jesdisciple: `bzr push lp:chaos2d --overwrite` should do it I think [18:24] (it's too late now, and I accidentally deleted the wrong half of the conflict... now rewriting one of those four files where I had made massive changes) [18:24] alright, thanks [18:25] Jesdisciple: if you had everything committed, and the merge went wrong, you can use `bzr revert` to get back to the latest commit [18:25] sweet, thanks [20:10] is bzr-colo in core yet? [20:11] I found some mailing list traffic about something like but couldn't follow the discussion [20:12] ah I guess not [20:12] idnar: hi [20:13] jelmer: hi :) [20:13] idnar: there is some degree of colocated branch support in core nowadays [20:13] idnar: in 2.5 onwards [21:58] I set global ignores in ~/.bazaar/ignore , but do not see them with 'bzr ignore --default-rules' . Ideas why? Strace tells me ~/.bazaar/ignore is never accessed. [22:03] edakiri: is your version of bzr new enough to use it? [22:03] Kamping_Kaiser: Bazaar (bzr) 2.5.0dev6 [22:04] The docs i am looking at are for 2.5.0dev1 , so I figure the version of bzr i have should be new enough. [22:05] edakiri: I think --default-rules just prints the hardcoded list in bzr itself that it will write out if there is no ~/.bazaar/ignore file [22:25] I think that is so. [22:47] Hi - qbzr's diff app has an option to ignore whitespace changes. Is there a way to do that with straight 'bzr diff' as well? [22:54] thomi: hi [22:54] hi jelmer [22:54] thomi: I think something like "bzr diff --diff-options -w" [22:56] jelmer: ahh, thanks [23:02] thomi: anytime :) are you having fun in unity land? [23:03] jelmer: yeah, it's good fun. Working from home takes a bit of getting used to though, but once you learn to avoid distractions it gets easier [23:03] I need to get out of the house more though - some weeks I hardly go outside during the day... [23:53] wgz: hey [23:53] wgz: so I found a bug in your testtools encoding detection code; triggers implicit decode if the linecache has unicode contents in it [23:53] \o/