Re: Marginal features

On Sat, May 07, 2005 at 08:44:20AM -0400, David Roundy wrote:
> This is a common complaint about darcs, and is a tough problem.  I think
> the best solution is to *not* treat the patches as having identical
> identities, but in the conflict resolution to recognize what the user has
> tried to do and suggest a default "trivial" resolution.  I'd like to have a
> distinction in a future darcs between "unresolved conflicts" and "resolved
> conflicts".  The latter would be actual conflicts, but ones for which darcs
> was able to suggest a reasonable resolution.  Thus "identical" patches
> would fall into the latter category.  It'd still be a conflict and would
> require a resolution patch, but the user would get a nice message like "We
> were able to resolve 5 conflicts in foo.cpp, please record if this is
> satisfactory."

This is basically what we had decided. It's not terribly useful to present 2
identical pieces of text to the user and ask "which of these do you want?"
Glossing over the backend not recognizing them as the same by automatically
resolving makes a lot of sense.

Ross