Michael Olson <[EMAIL PROTECTED]> writes: > Doing the other way (git -> bzr) ought to work with git-fast-export + > bzr-fast-import, but a few quick attempts that I made earlier today > couldn't get bzr-fast-import to work right.
Status update: I was able to create a new bzr branch with bzr-fast-import, but bzr does not think that it shares any ancestors with my other branch, which exhausts my knowledge of bzr to solve. I tried doing "bzr merge -c NNN ../path/to/imported/bzr-dir" on an individual commit, but it generated awful merge conflicts, to the point where it renamed a subdirectory from NAME to NAME.moved (?!). I also tried making a bundle with "bzr bundle" in hopes of applying it to the old repo, but no dice: "bzr: ERROR: No submit branch known or specified". Trying to apply the patches manually now ... -- | Michael Olson | FSF Associate Member #652 | | http://mwolson.org/ | Hobbies: Lisp, HCoop | | Projects: Emacs, Muse, ERC, EMMS, ErBot, DVC, Planner | `-------------------------------------------------------'
pgpieuSzgdAMc.pgp
Description: PGP signature
_______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
