[PATCH 3 of 4] hgmerge: remove obsoleted code, update docs

Matt Mackall mpm at selenic.com
Tue Jan 8 11:22:24 CST 2008


On Tue, 2008-01-08 at 11:20 -0600, Steve Borho wrote:
> On Tue, 2008-01-08 at 15:44 +0100, Arve Knudsen wrote:
> > On Jan 8, 2008 5:19 AM, Steve Borho <steve at borho.org> wrote:
> >         
> >         On Mon, 2008-01-07 at 18:10 -0600, Oliver Xymoron wrote:
> >         > On Mon, 2008-01-07 at 15:20 -0600, Steve Borho wrote:
> >         
> >         > mymerge = supermerge -vkm $local $other $base -o $output 
> >         
> >         
> >         the priority and win path settings are going to be pretty
> >         rarely used
> >         for user-defined tools. In this example they could have just
> >         used:
> >         
> >         myHtmlPlugin.arguments = -m $local $other $base $output
> > 
> > A possibility would be to always assign user-defined tools a certain
> > priority (configurable via [merge]?), so for instance when one defines
> > a new tool it is automatically preferred to standard ones. 
> 
> If a user is going through the trouble of defining their own tool, it is
> most likely going to be assigned to 'default' or to a file filter, both
> of which completely override the tool search.  So I don't think this is
> necessary.

Actually, this struck me as quite a good idea.

-- 
Mathematics is the supreme nostalgia of our time.



More information about the Mercurial-devel mailing list