[00:51] <kolbe> $ bzr branch lp:maria/5.5
[00:52] <kolbe> - 498953KB   198KB/s | Fetching revisions:Inserting stream
[00:52] <kolbe> bzr: ERROR: Connection error: Couldn't resolve host 'bazaar.launchpad.net' [Errno -2] Name or service not known
[00:52] <kolbe> *cry*
[00:52] <kolbe> there is really no way to resume this operation? when i try running the same thing again i get 'bzr: ERROR: Target directory "5.5" already exists' :(
[01:15] <spiv> kolbe: sadly, no
[01:15] <spiv> kolbe: you can manually fetch incrementally, though
[01:15] <kolbe> how do i do that?
[01:16] <spiv> kolbe: bzr branch lp:maria/5.5 -r 1000 ; cd 5.5 ; bzr pull -r 2000 ; bzr pull -r 3000 ; …
[01:16] <spiv> It's not great, but it will eventually work.
[01:16] <kolbe> heh, jesus :(
[01:17] <kolbe> well, thanks :)
[01:17] <spiv> Glad I could help.
[16:33] <ElMonkey> hi
[16:33] <ElMonkey> i'm trying to get to grips with bzr-git, with a repo hosted on github
[16:34] <ElMonkey> does anybody know how to avoid the "diverged branches" crap every time i dpush from another computer, and then try to pull?
[16:34] <ElMonkey> is there some other command to use, so that it doesnt happen?
[17:07] <beuno> AttributeError: 'NoneType' object has no attribute 'save_changes'
[17:07] <beuno> haven't seen that one before
[17:07] <beuno> anyone have any clues?
[17:07] <beuno> was trying to reconfigure --unstacked
[17:07] <beuno> in saucy
[18:26] <beuno> turns out it wasn't stacked
[18:26] <beuno> not the best error message  :)
[20:28] <ElMonkey> anybody have a decent workflow for using bzr-git with a github repo?
[21:20] <chinoto> Is it possible for bazaar to know about branches that aren't ancestors of the current commit? It seems the only possible way to (almost) do this is to get a copy of all branches that are currently being worked on from your codevelopers, and even then I'm not sure. Currently I'm learning about git to see the differences and so I can convince my team to switch if it turns out better.
[21:20] <chinoto> http://www.szakmeister.net/blog/2009/oct/12/bazaar-subversion-super-client/#great-toolchain
[21:21] <lifeless> chinoto: bzr can know about such branches of course
[21:21] <lifeless> chinoto: it couldn't merge branches if it couldn't.
[21:23] <chinoto> So far we've only worked with bzr in a straight line... I've tried to understand how to work with separate branches in bazaar, but it seems the only way to do so is having copies lying around, which would be a little inconvenient for web development :/
[21:25] <chinoto> It's fine if developers only ever work on one thing at a time and commit their work somewhere when they are done.
[21:26] <chinoto> I believe I'm seeking a workflow that isn't possible in bazaar :/
[21:27] <lifeless> chinoto: colocated branches, or branches in a treeless shared repo, both will do exactly what you want
[21:27] <lifeless> chinoto: http://doc.bazaar.canonical.com/developers/colocated-branches.html I believe.
[21:29] <chinoto> The problem is that I don't want to reconfigure apache and project specific variables to make each branch work... I guess I could use symlinks, but I'm not sure how the Windows developers would deal with that.
[21:32] <lifeless> you don't need to.
[21:32] <lifeless> standard built in workflow in bzr :)
[22:48] <chinoto> lifeless: Finally think I understand it, so basically you still have a directory for each branch, but you work on them from one?
[22:51] <chinoto> ugh, got a headache from soda or something, seeya