[darcs-users] Yet another conflict resolution idea.

[Eric Kow]

Hi,

On 13/06/2008, Petr Rockai <me at mornfall.net> wrote:
>  ...my proposal would be to disallow conflicts altogether: obviously, saying
>  conflicts are not allowed won't magically make them go away and some mechanisms
>  to deal with them need to be put into place. That would be about this:

This reminds me of an idea that David was working on in the very early
phases of darcs2 (and Jason's Summer of Code project).

The history of darcs2 can be seen as a conflictor sandwich:

2005-02 - conflictors
2006-09 - dead-patches
 http://thread.gmane.org/gmane.comp.version-control.darcs.devel/4477
 http://lists.osuosl.org/pipermail/darcs-devel/2006-July/004505.html
 [it's the same message, just posting both links for posterity]
2007-11 - conflictors return!

Note: the dates aren't accurate at all!  Anyway, it's the dead-patches
idea that yours sounds a bit similar to.  Would you mind doing the
research?

Sorry to make you dig.  I hope this gives you a head start.

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9