[darcs-devel] Conflicts...?

[Eric Y. Kow]

Hi William,

[only CC'ing darcs-devel; feel free to forward]

> >  it sounds like you've found one.  I tried searching the archives,
> > and I found a lot of discussion, but it was hard to find what the
> > final solution was (there seemed to be a bunch of options and it isn't
> > clear which one was chosen and what its final form was).

I don't fully understand what is going on, but the basic gist was that
conflictors are back, and are now being implemented using the
ConflictedPatch representation originally intended for the cancellation
patch code.

As the Conflicts FAQ mentions, "a patch followed by its inverse will not
conflict with any other patch".  Come to think of it, I'm not sure what
that really means.  Maybe it disappears so that you can commute stuff
past the pair p p^?.  If so, I wonder what happens when you then
obliterate p^

Hope that gives you a start, and David (etc) can give you more details.

-- 
Eric Kow                     http://www.loria.fr/~kow
PGP Key ID: 08AC04F9         Merci de corriger mon français.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 186 bytes
Desc: not available
Url : http://lists.osuosl.org/pipermail/darcs-devel/attachments/20071119/db16cc48/attachment.pgp