=== jasono is now known as your_favorite_ja === your_favorite_ja is now known as jasono [01:05] * jasono is away: I'm busy [01:30] james_w`: http://package-import.ubuntu.com/status/icu.html === frakturfreak_ is now known as frakturfreak === s1aden is now known as sladen [13:18] Hi, is there a way in Bzr to recover from an aborted operation? My VM crashed while trying to do a Bzr merge, and now I get: bzr: ERROR: The dirstate file (DirState(u'/home/anteru/Dev/n/src/trunk/.bzr/checkout/dirstate')) appears to be corrupt: failed to find trailing NULL (\0). Trailing garbage: '7a4bfab9edc5ca5aa9d6da' [13:29] rendering all local data more or less unusable [15:28] Anteru: Not as such, no. If you were doing a merge, that suggests you started from a clean tree though, so you can probably blow it away and just check it out fresh. [17:51] vila! [17:51] :) [19:27] vila! [19:27] jelmer: pong [19:27] jelmer: lunch ? [19:29] vila: we're about to head out for some food [19:29] care to . [19:29] coming, 2th floor o lobby ? [19:30] 2th2nd floor [19:30] ok [19:57] I search for a printed book about bazaar but I couldn't find any one. Is there something available? [20:55] guys im brand new to version control is bazaar a good choice to start with [20:56] will probably be using bazaar explorer [20:57] brando753: Yes, I find Bazaar to be a good starter [20:57] brando753: Which OS are you using? [20:58] awilkins, ubuntu 10.10 been using linux for over 3 years [20:59] I find a combination of the CLI and the qbzr plugin to be useful for most tasks - I can't say that I've used bzr-explorer in anger [20:59] I do find bzr to be easier to pick up than git [21:00] thats good :D [21:01] I also find it to be a better DVCS for interaction with a team using SVN than git is [21:01] my only issue is reading the documentation on bazaar-explorer assumes you know all the terminology, which i dont :( [21:05] http://doc.bazaar.canonical.com/bzr.2.2/en/user-guide/introducing_bazaar.html [21:06] awilkins, thanks will look at that [21:13] thanks that was what i was looking for [21:14] Should I be getting this on a bzr revert? bzr: ERROR: Cannot lock LockDir(http://bazaar.launchpad.net/~eopas-au/eopas/trunk/.bzr/branch/lock): Transport operation not possible: http does not support mkdir() [21:15] johnf: could you paste the command ; I suspect you're trying to revert the branch instead of your local working copy [21:18] hiya [21:18] Unable to load plugin 'svn'. It requested API version (2, 3, 0) of module but the minimum exported version is (2, 4, 0), and the maximum is (2, 4, 0) [21:18] running latest daily builds [21:19] awilkins: nm: just realised it's a co and not a branch [21:19] That would be why :-) [21:19] Where's your copy of bzr-svn installed from? the repo or a branch of the sources? [21:19] bzr 2.3.0~beta4+bzr5615~ppa3877+3874~maverick1, bzr-svn 1.0.4+bzr3505~ppa364+366~maverick1 [21:20] mathrick: If you're running nightlies, you might have to run plugins from their sources and even edit them a little [21:21] aww [21:21] well, I'm pointing this out, since they're very clearly out of sync [21:21] mathrick: In this case I suspect you'll get by checking out bzr-svn into your ~/.bazaar/plugins folder, and maybe tweaking it's version parameters in __init__.py [21:21] IMHO, beta should export 2.3.0 too if anybody out there depends on it [21:23] mathrick: Perhaps, unless it breaks the API from the perspective of 2.3.0 (which I can't say if it does or not) [21:24] I guess. Is 2.3.1 considered to be compatible with 2.3.0 say when requesting bzrlib API? [21:30] Hi, I've submitted my first (very tiny) patch for Bazar documentation and got one approval so far. What else do I need to do to get the patch merged into the trunk? === lionel__ is now known as lionel