[darcs-devel] [issue1649] null conflict resolutions

[Eric Kow]

Eric Kow <kowey at darcs.net> added the comment:

OK, I think I'm going to downgrade this to a feature (I'm flip-floppy on this,
but I doubt it matters very much).

It sounds like we'd need somebody to think of a way how this should work on the
UI level (hopefully without having to add any new constructs).

I *guess* one workaround might be to record the arbitrary non-empty resolution
(eg. the conflict markers), rollback, unrecord and amend the first patch.  (I'm
sure there's a less convoluted way around it... but I think you get the idea).

Also: is it obvious why --ask-deps doesn't allow this?

----------
assignedto: mornfall -> 
priority: bug -> feature
status: waiting-for -> need-action
title: impossible to resolve conflict by reversion -> null conflict resolutions

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