[issue2251] transplant should support inline conflict markers and/or merge tools

Knut Arild Erstad bugs at mercurial.selenic.com
Fri Jun 25 11:21:15 UTC 2010


New submission from Knut Arild Erstad <knutae at gmail.com>:

Currently transplanting changesets with conflicts lead to .rej files
throughout the working dir which has to be resolved manually.  This is IMO
awkward and error-prone, especially compared to the built-in conflict handling.

I would prefer conflict handling to just work the same way as for "hg merge"
(full support for merge tools), but just inlining conflicts instead of
creating .rej files would also be a big improvement.

By the way, I think the same problem exists in other commands as well, such
as "import".

----------
messages: 12899
nosy: knute
priority: feature
status: unread
title: transplant should support inline conflict markers and/or merge tools

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2251>
____________________________________________________


More information about the Mercurial-devel mailing list