Darcs always produces the same merge result, whatever order you do merges in. There's no formal proof of this from the ground up, unless there's one for Camp yet, but our test suite does contain randomised tests of this property for 3 patches, and there is a semi-formal proof kicking around that if this property is true for 3 patches, it's true for any number of patches.
Known exceptions are the "setpref" patches which are buggy, and also by design if there's a conflict the marks you get in your working copy aren't consistent - but the "pristine" repository should be consistent. On 30/04/2011 07:15, Michael Olney wrote: > The article points out a case where Git can produce multiple results > (which IMO would ideally trigger a manual resolution), but does not > demonstrate that Darcs does any better in general. Perhaps Darcs does > produce more "consistent" patches than Git does. As far as I know that > is yet to be satisfactorily stated let alone demonstrated to be true. > > On 17 April 2011 21:09, Sven Strittmatter <[email protected]> > wrote: >> Hi *, >> >> http://r6.ca/blog/20110416T204742Z.html >> >> -Sven >> _______________________________________________ >> darcs-users mailing list >> [email protected] >> http://lists.osuosl.org/mailman/listinfo/darcs-users >> > _______________________________________________ > darcs-users mailing list > [email protected] > http://lists.osuosl.org/mailman/listinfo/darcs-users > _______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
