On Fri, Sep 26, 2008 at 17:01:49 -0400, David Roundy wrote: > Here's a bug fix for issue1043, which was a pretty scary bug in the > conflict-handling code for the darcs-2 formalism. I had failed to > take into account a possible scenario (which I wrongly thought was > impossible). I've fixed that by switching to using in > mergeAfterConflicting a variant of commute which doesn't allow > conflicting patches to commute, which seems to solve the problem.
So, I haven't looked at this yet. Do you reckon it's safe to put it in the release? -- Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow> PGP Key ID: 08AC04F9
pgpuIYBMMuFGs.pgp
Description: PGP signature
_______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
