[darcs-devel] [issue1649] impossible to resolve conflict by reversion

[Petr Ročkai]

Petr Ročkai <me at mornfall.net> added the comment:

Get a conflict, resolve it by removing everything between vvv and ^^^ markers
(i.e. *both* sides of the conflict). But that is the pristine state, so no way
to record that as a resolution. You get the same effect from reverting. You
cannot record an empty patch depending on the two conflicting patches either,
since --ask-deps does not let you do that. So you end up recording a pair of
patches, one to make an arbitrary non-empty resolution and then roll it back.
Or so. Not-so-nice.

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue1649>
__________________________________