Merging two branches without actually merging

[kostolma lokmit]

Hello,

This looks like a fairly common and straightforward requirement, but I've
looked into transplant extension, rebase, import, export, etc, and I have
yet to figure it out. Hopefully I am missing out something obvious.
I would like to "merge" two branches (named branches, to be specific) such
that the branches themselves don't go away. Essentially, I want to pull
changes from a  revision but manually resolve cherrypick changes/conflicts
(using my merge program).

It seems that import, export, transplant, etc generate patches and
changesets that are directly applied to the current working directory. But I
don't want that... instead, I want to manually determine what changes go in.

Appreciate your help.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20110130/2d6256cb/attachment.htm>