[19:56] <pmatulis> say i do a 'bzr branch lp:whatever'; then 'bzr merge lp:~jdoe/whatever/review1'; and then jdoe does more work before i merge his work into trunk (the 'whatever' project).  how do i avoid having to include a commit for the original merge?  i'd rather just have a single commit
[20:22] <eridu> is there a way to tell git-import to use the development-subtree repo format? I want to import a repo with submodules.
[20:25] <jelmer> eridu: nested trees aren't really supported yet - bzr-git supports them, but bzr itself does not
[20:26] <eridu> jelmer: I'm aware of this and assume all risks related to using nested trees -- I understand they will blow up in my face, shoot my dog, and when I least expect it, destroy all that I love and hold dear
[20:26] <jelmer> you can sort of force the combination to work by initializing the target repo before running git-import
[20:26] <jelmer> bzr init-repo --development-subtree foo
[20:26] <eridu> can you git-import over an existing repo?
[20:27] <jelmer> bzr git-import /url/for/git-repo foo
[20:27] <jelmer> eridu: yes
[20:27] <eridu> jelmer: thanks! didn't know that
[20:28] <fullermd> The trick is to constantly expect your dog to be shot.  Then you're safe.
[20:35] <eridu> hah, that made bazaar crash
[20:35] <eridu> I expected my dog to be shot, but not that quickly