[darcs-devel] darcs patch: Added mergeFL and mergeFL_FL (and 4 more)

[Jason Dagit]

Hello,

Here is the new merge algorithm that works with conflicts by
creating 'conflicted' patches to store the conflicts in as 
they are discovered.

I hadn't been showing this off yet, because I'm not sure if
it really is order independent (as merge) should be.  But, I
think it would probably be a good idea to share these patches
so that I'm not the only one with a copy :)

I've created some preliminary documentation of the new merge
on my wiki.  I'd like to put it in a pdf or something instead,
so I'm just using the wiki to work out the description for now:
http://codersbase.com/index.php/Darcs_Merge

Thanks,
Jason


Mon Jun 18 19:50:04 PDT 2007  Jason Dagit <dagit at codersbase.com>
  * Added mergeFL and mergeFL_FL

Wed Jun 20 15:03:35 PDT 2007  Jason Dagit <dagit at codersbase.com>
  * Started fancy_merge

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

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