[darcs-devel] darcs patch: test format-2. (and 15 more)

[David Roundy]

Hi Eric,

Here's the current state of the conflictors code.  It's not
working yet, but a bunch of tests are working (and I'm adding
test cases daily).

David

Tue Aug 28 17:26:26 EDT 2007  David Roundy <droundy at darcs.net>
  * test format-2.

Thu Sep 20 08:27:42 EDT 2007  David Roundy <droundy at darcs.net>
  * Add first cut at conflictors.

Thu Sep 20 11:56:39 EDT 2007  David Roundy <droundy at darcs.net>
  * Second conflictor code, passes a few more test cases.

Thu Sep 20 12:35:53 EDT 2007  David Roundy <droundy at darcs.net>
  * add another unit test.

Thu Sep 20 15:15:34 EDT 2007  David Roundy <droundy at darcs.net>
  * make a few more test cases work

Thu Sep 20 16:07:48 EDT 2007  David Roundy <droundy at darcs.net>
  * fix detection of conflicts between conflictors.

Fri Sep 21 10:57:51 EDT 2007  David Roundy <droundy at darcs.net>
  * define "Shy" patch type, which preserves dependencies on commute.

Wed Sep 26 14:41:58 EDT 2007  David Roundy <droundy at darcs.net>
  * various refactorings and work on conflictors.

Wed Sep 26 17:05:11 EDT 2007  David Roundy <droundy at darcs.net>
  * implement a bit more conflictor commuting.

Fri Sep 28 16:14:06 EDT 2007  David Roundy <droundy at darcs.net>
  * redefine Conflictor to hold conflicted patches in a more natural order.

Tue Oct  2 11:52:52 EDT 2007  David Roundy <droundy at darcs.net>
  * make one more conflictor merge work.
  Alas, the conflictor commute is still known to be
  buggy, and I know what I need to do next (but one
  thing at a time).

Tue Oct  2 12:21:34 EDT 2007  David Roundy <droundy at darcs.net>
  * define a color version of errorDoc (for debugging).

Tue Oct  2 13:01:02 EDT 2007  David Roundy <droundy at darcs.net>
  * define a color traceDoc (for debugging).

Tue Oct  2 13:30:39 EDT 2007  David Roundy <droundy at darcs.net>
  * eliminate type ConflictedSet

Tue Oct  2 16:02:45 EDT 2007  David Roundy <droundy at darcs.net>
  * add support for a few more conflicting possibilities.

Tue Oct  2 16:20:41 EDT 2007  David Roundy <droundy at darcs.net>
  * give prettier errors when unit fails.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: text/x-darcs-patch
Size: 202027 bytes
Desc: A darcs patch for your repository!
Url : http://lists.osuosl.org/pipermail/darcs-devel/attachments/20071002/c4cb6b9e/attachment-0001.bin