[darcs-devel] darcs patch: Added fancy_commute, still working on fa... (and 8 more)

[David Roundy]

Here's the latest of Jason and my merge code.  It's not much
advanced but I've moved it into a separate module, which makes
things noticably cleaner, in my opinion.

David

Fri Jun 22 17:01:36 PDT 2007  Jason Dagit <dagit at codersbase.com>
  * Added fancy_commute, still working on fancy_merge

Tue Jun 26 16:05:58 PDT 2007  Jason Dagit <dagit at codersbase.com>
  * Implemented fancy_mergeFL_FL

Tue Jun 26 16:52:49 PDT 2007  Jason Dagit <dagit at codersbase.com>
  * Implemented fancy_mergeFL_FL2

Wed Jul 25 14:54:29 PDT 2007  Jason Dagit <dagit at codersbase.com>
  * Fixed fancy_mergeFL and fancy_mergeFL_FL

Fri Jul 27 11:54:00 PDT 2007  David Roundy <droundy at darcs.net>
  * add named primitive subpatch helpers.

Fri Jul 27 12:31:53 PDT 2007  David Roundy <droundy at darcs.net>
  * add (unused) "cancel" patches.

Fri Jul 27 17:06:18 PDT 2007  David Roundy <droundy at darcs.net>
  * add marking of cancelled patches

Wed Aug  1 13:58:59 PDT 2007  David Roundy <droundy at darcs.net>
  * add new Merge module.

Wed Aug  1 15:55:40 PDT 2007  David Roundy <droundy at darcs.net>
  * cut new merge code from old Commute module.

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