Best way to merge a git revision into a mercurial repository?
Currently, I’ve generating a diff using
git diff, and merging it using patch. That had a few problems, so I switched
hg import, which has problems of its own.
- How do I apply rejected hunks after fixing them?
- Seeing the expected results of a commiting only part of a file in git?
- diff and new empty files
- How can you combine git add patch -p mode with diff's ignore-all-space
- Git: How can I find a commit that most closely matches a directory?
- Git: Generate patch of all commits made on “feature” branch without referring to commit IDs
What’s the best way of doing this?
(What errors? The biggest culprits are lost hunks, and hunks that don’t merge and need to done manually. I get “bad end of line” occasionally, and
patch sometimes reports that the git diff is corrupted.)
One Solution collect form web for “Best way to merge a git revision into a mercurial repository?”
Have you tried using the hg-git extension? With it, you can pretty easily pull from a Git repo, thus converting a Git repo into a Mercurial repo in the process (and, if desired, you can also push back into the Git repo from hg).