Mercurial copy patch to repository

I'm using Mercurial repository and I have a patch in 'git' format and I wanted to know how I can apply that开发者_如何学运维 patch to my current repository which is Local.

Thanks

hg import <patchfile(s)> should be able to handle git-style patches.

Use hg import --no-commit <patchfile(s)> if you don't want it to automatically commit the changes after each patch is imported.

Mozilla's FAQ mentions this: https://developer.mozilla.org/en/Mercurial_FAQ#How_can_I_diff_and_patch_files.3f

Try hg import --no-commit, Mozilla has a rather useful FAQ regarding trading patches between Git and Mercurial.

Depending on your platform, you can also just use patch, e.g. patch -p1 < some_patch_from_git.patch. That may actually be better as you'll see any fuzz and not have to deal with trusting the author just for one patch.

Edit

If your patch does not go in cleanly, none of the above methods are going to work. Your code base is not what the patch expects if hunks fail to apply. Look at the rejects and see what the patch expected your code to be at any given line, then rebase accordingly.