"Nicolas Pouillard" <[EMAIL PROTECTED]> writes: > Excerpts from Nicolas Pouillard's message of Wed Jan 16 11:23:52 +0100 2008: >> Excerpts from Tommy Pettersson's message of Wed Jan 16 11:22:00 +0100 2008: >>> On Wed, Jan 16, 2008 at 02:52:45AM +0000, Nicolas Pouillard wrote: >>>> Wed Jan 16 03:47:06 CET 2008 [EMAIL PROTECTED] >>>> * Add --dont-allow-conflicts to darcs pull. >>>> >>>> It also adds --allow-conflicts that is the default behavior of pull. >>> >>> I only looked at this patch quickly, but it looks like it >>> differs from the conflict options to the Apply command in a >>> surprise-prone way. I think the options should be: >>> >>> --mark-conflicts (default behavior for Pull) >>> --allow-conflicts (...but don't mark them) >>> --dont-allow-conflicts (default behavior for Append) >> >> You're right, I will resubmit a patch then. > > I've just sent another patch (that amend this one).
Speaking of this, wouldn't it be reasonable to make pull default to --dont-allow-conflicts if there are unrecorded changes in the repo? -- Regards, Feri. _______________________________________________ darcs-devel mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-devel
