I've now created a pdf file to help explain this merge business.
http://projects.codersbase.com/repos/research/Merge.pdf If you want the source of the document, it's in a darcs repository so just go up one level with a darcs get: darcs get http://projects.codersbase.com/repos/research If you find some typos or want to add comments, either reply to this message or send me a patch :) Please let me know if the explanation does not make sense. I've tried to create lots of figures and include the pertinent source code, but it could probably be improved in ways I'm not aware of (yet). Thanks, Jason On 7/10/07, Jason Dagit <[EMAIL PROTECTED]> wrote:
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 <[EMAIL PROTECTED]> * Added mergeFL and mergeFL_FL Wed Jun 20 15:03:35 PDT 2007 Jason Dagit <[EMAIL PROTECTED]> * Started fancy_merge Fri Jun 22 17:01:36 PDT 2007 Jason Dagit <[EMAIL PROTECTED]> * Added fancy_commute, still working on fancy_merge Tue Jun 26 16:05:58 PDT 2007 Jason Dagit <[EMAIL PROTECTED]> * Implemented fancy_mergeFL_FL Tue Jun 26 16:52:49 PDT 2007 Jason Dagit <[EMAIL PROTECTED]> * Implemented fancy_mergeFL_FL2 _______________________________________________ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
_______________________________________________ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
