3

I'm maintainig a project with two heads which are pretty much alike so i thought it would be possible to just transplant a changeset from one branch to the other. But this sometimes fails because the code to change is on a different line and i end up with .rej file.

What are my options from that point on now?

Ist there any visual interface that can help me fix this - like when resolving a merge?

Can i tell transplant to ignore line numbers?

Florian F
  • 4,044
  • 3
  • 30
  • 31

1 Answers1

4

Mercurial 2.0 introduced the Graft command.

Like explained in the following SO answer : Graft vs. Transplant, Graft uses the internal three way merge mechanism instead of the patch one, so it is able to better handle the kind of problems you're describing. You can also have a look on this question : mercurial: how to cherry pick during merging.

Community
  • 1
  • 1
krtek
  • 26,334
  • 5
  • 56
  • 84