On Wed, Aug 29, 2007 at 10:35:53AM -0700, David Roundy wrote: > This last change is (supposed to be) a true refactor, in that > it doesn't actually change functionality. But since it's affecting > code that is used all the time, I'd appreciate a code review. ... > Wed Aug 29 10:00:12 PDT 2007 David Roundy <[EMAIL PROTECTED]> > * Refactor merging functionality into Repository.
Just to clarify: this refactor is a critical step in the conflict-handling change, as it changes things so there is just one function (tentativelyMergePatches_) that now does merging in darcs, and it's hidden in Repository. So it'll be easy (in principle) to swap in a new merge algorithm without touching more than just this one function. For me, this is an exciting step. -- David Roundy http://www.darcs.net _______________________________________________ darcs-devel mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-devel
