[darcs-devel] darcs patch: Partial remerge (and 8 more)

David Roundy droundy at darcs.net
Fri Aug 24 16:17:25 UTC 2007


Hi all,

Here's the latest of the "remerge" function, which is intended to
be the core of the new conflict-handling functionality.  It will
compute which active patches have been involved in conflicts, and
disable those patches.  Basically, this is a canonicalization of the
repository state.  I've added some tests into a new test module, and
plan to add more tests and I code up the rest of remerge (which is
most emphatically incomplete).  I'm avoiding quickcheck simply because
it's so hard to generate a decent Arbitrary instance for patches.

David

Wed Aug 22 05:55:55 PDT 2007  Jason Dagit <dagit at codersbase.com>
  * Partial remerge

Wed Aug 22 06:21:47 PDT 2007  Jason Dagit <dagit at codersbase.com>
  * Fix conflict with merging to unstable

Thu Aug 23 11:45:10 PDT 2007  David Roundy <droundy at darcs.net>
  * add some a new unit test module (starting out small).

Thu Aug 23 12:06:57 PDT 2007  David Roundy <droundy at darcs.net>
  * add eq_patches support for Conflicted, etc.

Thu Aug 23 12:35:26 PDT 2007  David Roundy <droundy at darcs.net>
  * introduce order-safe compare

Thu Aug 23 12:58:09 PDT 2007  David Roundy <droundy at darcs.net>
  * add not-test-passing test of remerge

Thu Aug 23 13:12:28 PDT 2007  David Roundy <droundy at darcs.net>
  * clean up unconflict_some_to_end

Fri Aug 24 08:39:31 PDT 2007  David Roundy <droundy at darcs.net>
  * add some more tests, and improve remerge.

Fri Aug 24 09:12:52 PDT 2007  David Roundy <droundy at darcs.net>
  * generalize new unit testing to sequences of patches.

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


More information about the darcs-devel mailing list