Hi David and Ganesh, I've skimmed over your patches in the conflicts tree.
Using the 'x' key, I am ignoring everything in Darcs.Patch.Conflic* which is changing rapidly anyway, and all of Ganesh's QuickCheck work as I tend to ignore the unit tests anyway (this may not be so wise; I ought to treat the tests as documentation). My superficial guess is that the result of Ganesh's work is that not only will the checks reveal bugs, they will also produce human-readable test cases when they do, in which case, hooray! As I write this, my last three patches are: * another merge example, and some more verbosity. * add more traces. * move commuteWhatWeCanFL. Please let me know if you would like me to push any of these patches into unstable, or if you would prefer I held off for a while. Also, some minor comments on everything else. ====================================================================== eliminate unsafe join_patches. ====================================================================== > - Just (Sealed p, rest) -> p : rp rest > + Just (Sealed x, _) -> x I saw this change in finalize_patch_changes and withTentative. This is intentional, right? I'm guessing so because I see it in two places. ====================================================================== make empty hunk patches (never generated by darcs) commute like identity. ====================================================================== > +commuteFP f (Hunk line1 [] [] :< p2) = seq f $ Succeeded (FP f p2 :< FP f > (Hunk line1 [] [])) > +commuteFP f (p2 :< Hunk line1 [] []) = seq f $ Succeeded (FP f (Hunk line1 > [] []) :< FP f p2) I know they are empty, but should the line numbers change if we encounter another hunk patch? ====================================================================== missing unsafeCompare case for Prim ====================================================================== > + unsafeCompare Identity Identity = True Hmm. Why are hunk patches excluded from this? I might have already asked this and forgotten the answer. -- Eric Kow http://www.loria.fr/~kow PGP Key ID: 08AC04F9 Merci de corriger mon français.
pgpfoPsPN6uIQ.pgp
Description: PGP signature
_______________________________________________ darcs-devel mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-devel
