cherry-picking with transplant?

[Greg Ward]

2009/3/26 Arne Babenhauserheide <arne_bab at web.de>:
> Should we open a bug "transplant should use the defined merge tools" or
> similar?

IMHO yes.  After experimenting with transplant last week, I realized
that Mercurial has first-class merges and second-class merges.  "hg
merge" is first-class because it invokes your chosen merge tool(s): no
.rej files to worry about.  "hg transplant" is second-class because
conflicts result in .rej files.  Yuck.  As a result, cherrypicking
fixes with Mercurial can actually be *worse* than with CVS, where at
least you get inline merge markers (IMHO easier to work with than .rej
files).

"hg export | hg import -" is also second-class.

Greg