[07:04] <gour> morning
[07:04] <gour> do you consider that brz-git is beta now?
[09:22] <jelmer> Hi gour
[09:23] <jelmer> I'm not sure, what does that mean?
[09:52] <gour> jelmer: well is it ready to recommend it (as beta) to some users forcing to use git and would be more pleased witz brz
[10:06] <jelmer> gour: I'm not sure; the software is stable, but things are still changing a lot and you need to keep your brz/brz-git/dulwich synced or things may not work because of API incompatibilities
[10:19] <gour> jelmer: ok, i'll wait a bit and using it personally before further recommendation
[11:21] <jelmer> gour: it should be okay to use, but there will be annoying API incompatibilities issues until breezy hits 3.0 beta
[11:37] <gour> jelmer: ok, i got it ;)
[12:53] <LeoNerd> Hrm... Migrating some commits of a project from bzr to git. Options? I see  `bzr fast-export | git fast-import`  but that appears to be for entire history
[12:54] <LeoNerd> I made my bzr branch as a snapshot of current master out of git, made some commits, and now I want to apply those same changes into git
[12:55] <LeoNerd> So my next thought was: checkout from git, cd into it, and use `bzr replay ../path/to/bzr/version` to replay individual commits. That gets upset too:  bzr: ERROR: Push is not yet supported for bzr-git. Try dpush instead.
[12:55] <LeoNerd> I don't want it to push. Just to apply
[13:07]  * LeoNerd decides to write a script to do it commit by commit
[13:09] <jelmer> LeoNerd: hi
[13:09] <LeoNerd> Hello
[13:10] <jelmer> LeoNerd: probably the thing that comes closest is to use bzr to generate git-am style patches and apply those with 'git apply'
[13:10] <LeoNerd> Yes. But I couldn't work out how to do that
[13:11] <jelmer> if you have bzr-git installed, I believe it's "bzr send --format=git -o dir -r-10"
[13:12] <LeoNerd> Ah,.. there's a --format option
[13:12] <LeoNerd> bzr: ERROR: No submit branch known or specified
[13:14] <jelmer> you can probably just specify the local branch if you specify a range
[13:14] <LeoNerd> Hrm... it mkdired 'dir' but that's now empty
[13:15] <LeoNerd> $ bzr send --format=git -r 2.. -o dir ../Net-Async-SOCKS+bzr1/
[13:15] <LeoNerd> bzr: ERROR: exceptions.TypeError: from_trees_options() takes exactly 10 arguments (9 given)
[13:16] <LeoNerd> Well that's fun too :)
[13:27] <LeoNerd> Ooooh this is so close.  bzr log -p  outputs a metadata header + patch. I can almost pipe that into  git apply  except for the fact that git expects file paths to begin with  a/  and  b/
[13:27] <LeoNerd> It doesn't look like there's arguments to bzr log -p to prepend those, nor git apply to not expect them
[13:31] <LeoNerd> Oh humm... it seems my entire endevour might be for naught :/ turns out what I thought was a clean snapshot of master, wasn't. :/ so I have some spurious other differences to fix up first
[13:32] <mgz> hm, the diff arg to set prefixes is amusingly also -p
[13:32] <LeoNerd> Yes... So I can get it from  bzr diff -pa/:b/
[13:33] <LeoNerd> I'll just run two commands, a bzr log without -p to get the metadata, plus bzr diff to get the patch
[13:36] <fullermd_> Almost makes one wonder if tailor still works   :)
[13:49] <gour> fullermd_: i believe it does not, based on the chat with its author some time (months) ago
[14:24] <fullermd_> Wouldn't be surprised.  It was always a neat but finicky hack.
[14:25] <fullermd_> Not sure I ever succeeded in using it to really do anything nontrivial, even when it was active.
=== gour_ is now known as gour