[prev in list] [next in list] [prev in thread] [next in thread] 

List:       darcs-conflicts
Subject:    [darcs-conflicts] another permuation set added.
From:       David Roundy <droundy () darcs ! net>
Date:       2005-11-23 13:49:43
Message-ID: 20051123134936.GG10314 () abridgegame ! org
[Download RAW message or body]

Hi all,

It's not a complicated permutation (I left my notebook in the office
again), but I've added another permutation set, this time for the case when
one patch conflicts with two that commute with each other.  Hopefully soon
(between bouts of large meals) I'll get to some more interesting scenarios.
I also plan to start adding unit testing code to verify that these commutes
work as expected when the conflictors are actually implemented.  I'll
probably only be able to verify that the effect of each patch is correct,
but that should still be very helpful.

Permutation of two commuting patches with one non-commuter

              A          B            C
    <-->AB    B'         A'           C
    <-->AC    B'       <A';@C|      |@A';C>
    <-->BC  <AB;@C|  |@B'A';(C)>    |@A';C>
    <-->BA  <AB;@C|   |@AB;(C)>     |@B;C>
    <-->CA    A        <B;@C|       |@B;C>

-- 
David Roundy
http://www.darcs.net

_______________________________________________
darcs-conflicts mailing list
darcs-conflicts@darcs.net
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-conflicts
[prev in list] [next in list] [prev in thread] [next in thread]