Comment 12 for bug 347729

I had a little longer look into this and I think the problem is with some colomns (:). I am not aware of how the fast-import file format should look like, but the attached patch allows me to push back to bzr from git exactly once. Note though that pulling further changes from bzr doesn't work:

bzr$ bzr commit -m "Latest"
bzr$ cd ../git
git$ git bzr fetch origin # this works
hack hack
git$ git -am "Some commit" && git bzr push origin # This works with the attached patch
git$ cd ../bzr
hack hack
bzr$ bzr commit -m "More bzr changes"
bzr$ cd ../git
git$ git bzr fetch origin # This fails. But removing the bzr marks file (which makes bzr reexport everything) and repeating suceeds.

I am a bit lost here and I would need someone with more insight for coaching.