On Wed, Aug 06, 2008 at 11:28:58AM -0700, Jeremy Shaw wrote: > At Wed, 6 Aug 2008 10:48:03 +0100, > Ian Lynagh wrote: > > > I've just had a quick read of > > http://citeseer.ist.psu.edu/prakash92undoing.html > > AFAICS this only really deals with the case where there are no > > conflicts, and doesn't talk about merging. > > AFAIK, the papers do not talking about merging. > > They cover conflicts in the case where you want to remove/reorder an > older patch which conflicts with a newer one.
Only in the case where you have already undone the newer one, and thus can just remove both the new patch and its inverse, I thought. > Since I don't know the darcs internals or patch theory, I don't have a > concept of how much is still missing The difficult part is still missing :-) Thanks Ian _______________________________________________ Haskell-Cafe mailing list Haskell-Cafe@haskell.org http://www.haskell.org/mailman/listinfo/haskell-cafe
