[darcs-devel] darcs patch: Add --{allow, dont-allow, mark}-conflicts to darcs pull.

Nicolas Pouillard nicolas.pouillard at gmail.com
Thu Jan 17 08:26:46 UTC 2008


Excerpts from Tommy Pettersson's message of Wed Jan 16 21:18:15 +0100 2008:
> On Wed, Jan 16, 2008 at 07:36:30PM +0000, Nicolas Pouillard wrote:
> > Wed Jan 16 20:34:26 CET 2008  nicolas.pouillard at gmail.com
> >   * Add --{allow,dont-allow,mark}-conflicts to darcs pull.
> >   
> >   This patch also merge the --external option to pull_conflicts_options
> >   like with apply.
> 
> Hmmm... I don't think merging --external-merger to the
> multi-choice option is a good idea. A common case is to have
> 'ALL external-merger my_favorite_merger" in the .darcs/defaults
> file, and expect 'darcs apply --mark-conflicts' to use
> my_favorite_merger.

So,   does  makes  sense  to  extract  the  external-merger  option  from  the
multi-choice option for both pull and apply?

-- 
Nicolas Pouillard aka Ertai


More information about the darcs-devel mailing list