Best way to merge a git revision into a mercurial repository?

I have a git repository, which has changes that I am slowly bringing into a mercurial repository. (It’s a weird history, and I’m hand checking everything, and just as well that I am).

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.

  • Git create branch from current checked out master?
  • Does Git work in Windows?
  • Check in single file with Mercurial?
  • How do I synchronise two remote Git repositories?
  • How to ensure database changes can be easily moved over DVCS using django
  • Pushing without a commit in Mercurial or Git
  • 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.)

  • pull instead of fetch - accidentally merged remote master into local branch
  • Git: How to “undo” a merge
  • How can I see what files Git is going to push to the server in Xcode?
  • Amend username for a pushed commit on Github
  • How to force update when doing git pull?
  • How to find out what causes file permissions to change when checking out files with git?
  • 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).

    Git Baby is a git and github fan, let's start git clone.