| poolie | hi wgz | 00:04 |
|---|---|---|
| wgz | hey poolie | 00:10 |
| === yofel_ is now known as yofel | ||
| vila | hi alll ! | 07:37 |
| mgz | morning! | 07:58 |
| vila | heya mgz | 08:01 |
| jelmer | hi mgz, vila | 08:13 |
| wgz | shall we get this party started? | 08:14 |
| * vila nods | 08:16 | |
| wgz | I created a thingy via the new cunning means described in a thread on the wotsit | 08:21 |
| vila | jelmer: joining ? | 08:25 |
| jelmer | vila: sorry, on my way | 08:27 |
| vila | jelmer: no worries | 08:27 |
| bialix | hi | 08:46 |
| bialix | 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:47 |
| wgz | looking | 08:48 |
| wgz | seems good bialix | 08:51 |
| bialix | thank you, wgz | 08:51 |
| bialix | new hat? new clothes? | 08:51 |
| bialix | :-) | 08:51 |
| wgz | I need to dress up in two outfits at once :) | 08:53 |
| bialix | ninja | 08:54 |
| bialix | wgz: I'll release qbzr then | 08:57 |
| bialix | not sure what I can do for explorer right now | 08:57 |
| wgz | bialix: I want to still get some fixes in for explorer | 09:05 |
| ccxCZ | 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:32 |
| jelmer | ccxCZ: that's a really hard thing to work around, bzr doesn't support backslashes in filenames at the moment | 10:38 |
| ccxCZ | I guess that filename is there by mistake anyway and I certainly don't need the e16/ subtree | 10:39 |
| jelmer | ccxCZ: you could dump the svn repository, remove the problematic filename and then import | 10:40 |
| ccxCZ | can we import from svndump? | 10:41 |
| ccxCZ | atm I have local copy of the repo obtained with svnsync, can I branch a subdir of that? | 10:42 |
| ccxCZ | it uses /trunk/projectname layout and I need only few of these | 10:43 |
| jelmer | ccxCZ: you can use a subdir, you just can't exclude a subdir | 10:56 |
| jelmer | ccxCZ: "bzr branch" allows you to specify a path in the repo | 10:56 |
| ccxCZ | ah got it to work now, thanks | 10:58 |
| ccxCZ | 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:35 |
| ccxCZ | I can svn co from that uri successfully; when I disable all plugins but svn it behaves the same | 11:46 |
| ccxCZ | fileabug? | 11:47 |
| jelmer | ccxCZ: you're running an old version f bzr-svn | 11:49 |
| ccxCZ | should I try 1.1.2 or trunk? | 11:51 |
| jelmer | 1.1.2 | 11:51 |
| ccxCZ | seems to work now, thanks again | 11:55 |
| * ccxCZ should have checked for latest version himself | 11:55 | |
| ccxCZ | hmm but why is it checking out the whole history? | 11:56 |
| jelmer | ccxCZ: it's just caching the revision metadata, not the contents of the revisions | 11:56 |
| ccxCZ | server is too unstable to get all 6k commits in one session, that's why I used svnsync | 11:57 |
| ccxCZ | seems I'll have to keep the sync version around for pulling then | 11:57 |
| ccxCZ | 60k commits actually | 11:57 |
| ccxCZ | 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:01 |
| ccxCZ | okay, I'll make some scripts to update my repos from the svnsync copy then | 12:02 |
| mgz | man, lwn trolls pretty hard of riddell's post about kubuntu | 12:13 |
| mgz | *off | 12:13 |
| mgz | and it works, 32 comments already :) | 12:13 |
| === Quintasan_ is now known as Quintasan | ||
| Riddell | mgz: yeah that jono guy holds no punches :) | 14:12 |
| mgz | Riddell: all those people saying nice things about you too :) | 14:25 |
| Riddell | I've had two job offers in the last hour :) [not wanting to take them] | 14:25 |
| === verterok` is now known as verterok | ||
| Jesdisciple | 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 |
| Jesdisciple | How can I merge? I can't find anything about how to specify a "base revision" | 17:59 |
| Jesdisciple | what I have been trying: bzr merge lp:chaos2d --revision 1 | 18:00 |
| LarstiQ | Jesdisciple: why not just `bzr merge lp:chaos2d`? | 18:17 |
| Jesdisciple | LarstiQ, $ bzr merge lp:chaos2d | 18:20 |
| Jesdisciple | Enter passphrase for key '/home/chris/.ssh/id_rsa': | 18:20 |
| Jesdisciple | bzr: ERROR: Branches have no common ancestor, and no merge base revision was specified. | 18:20 |
| LarstiQ | Jesdisciple: aha | 18:20 |
| Jesdisciple | ended up finding the solution here http://selfdocumentingcode.blogspot.com/2009/04/merging-unrelated-branches-in-bazaar.html | 18:20 |
| LarstiQ | Jesdisciple: right, that way you can get it done | 18:21 |
| LarstiQ | Jesdisciple: but since you're just starting out | 18:22 |
| LarstiQ | Jesdisciple: do you need the "old" one? | 18:23 |
| LarstiQ | Jesdisciple: if not, you could maybe just replace it with the new one and go from there | 18:23 |
| Jesdisciple | nope | 18:23 |
| Jesdisciple | how...? | 18:23 |
| LarstiQ | Jesdisciple: `bzr push lp:chaos2d --overwrite` should do it I think | 18:23 |
| Jesdisciple | (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 |
| Jesdisciple | alright, thanks | 18:24 |
| LarstiQ | 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 |
| Jesdisciple | sweet, thanks | 18:25 |
| idnar | is bzr-colo in core yet? | 20:10 |
| idnar | I found some mailing list traffic about something like but couldn't follow the discussion | 20:11 |
| idnar | ah I guess not | 20:12 |
| jelmer | idnar: hi | 20:12 |
| idnar | jelmer: hi :) | 20:13 |
| jelmer | idnar: there is some degree of colocated branch support in core nowadays | 20:13 |
| jelmer | idnar: in 2.5 onwards | 20:13 |
| edakiri | 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. | 21:58 |
| Kamping_Kaiser | edakiri: is your version of bzr new enough to use it? | 22:03 |
| edakiri | Kamping_Kaiser: Bazaar (bzr) 2.5.0dev6 | 22:03 |
| edakiri | 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:04 |
| jelmer | 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:05 |
| edakiri | I think that is so. | 22:25 |
| thomi | 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:47 |
| jelmer | thomi: hi | 22:54 |
| thomi | hi jelmer | 22:54 |
| jelmer | thomi: I think something like "bzr diff --diff-options -w" | 22:54 |
| thomi | jelmer: ahh, thanks | 22:56 |
| jelmer | thomi: anytime :) are you having fun in unity land? | 23:02 |
| thomi | 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 |
| thomi | I need to get out of the house more though - some weeks I hardly go outside during the day... | 23:03 |
| lifeless | wgz: hey | 23:53 |
| lifeless | 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 |
| lifeless | \o/ | 23:53 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!