Manual merge for some files during rebase (using TortoiseHg)

[Afriza N. Arief]

>
> I think this is a straight-forward merge/rebase question.   Rebase
>  uses Mercurial's merge machinery so you should be able to get the
> behavior you want by creating well tweaked [merge-patterns] and
> [merge-tools] ini sections.
>
> This may cause a rebase to be interrupted, though, requiring you to
> finish it on the command line.
>
> --
> Steve Borho
>

Thank you all for the help.

I found a way to prevent the auto commit.

1) do *hg rebase*
2) during the conflict and KDiff3 pops-up on the problem file, close it
without saving. this will not mark the problem file as "resolved"
3) continue merging non-problematic files (if any)
4) do *hg resolve* on the problem file, and some other files if you want.
this will pop-up the KDiff3. select "Choose B everywhere" to choose one good
copy, save, and close KDiff3.
5) verify the merge result by running IDE, compile, and fix errors
6) mark the files as resolved using *hg resolve -m*
7) continue/complete the rebase process by doing *hg rebase --continue*
8) done!


Best Regards,


Afriza N. Arief
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20091030/42539de6/attachment.htm