[darcs-devel] darcs patch: Add first cut at conflictors. (and 6 more)

[David Roundy]

Hi all,

Here's the latest state of the conflictors work.  Unfortunately,
the last patch is rather large, as one change led to a cascade of
others, including some refactorings that I didn't have the patience
to factor out.  Work continues...

David

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.

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