hgmerge: remove obsoleted code, update docs

Martin Geisler mgeisler at mgeisler.net
Thu Jan 10 12:28:50 CST 2008


Steve Borho <steve at borho.org> writes:

> On Wed, 2008-01-09 at 20:45 +0100, Martin Geisler wrote:
>> Steve Borho <steve at borho.org> writes:
>> 
>> > On Mon, 2008-01-07 at 18:10 -0600, Oliver Xymoron wrote:
>> >> On Mon, 2008-01-07 at 15:20 -0600, Steve Borho wrote:
>> >> > +  Example ~/.hgrc:
>> >> > +
>> >> > +    [hgmerge]
>> >> > +    default = kdiff3
>> >> > +    ext.html = myHtmlPlugin
>> >> > +    ext.lib = takemine
>> >> 
>> >> Extension-based is a little limited. The decode/encode filters can
>> >> take patterns. It's a bit odd to have a [merge] and an hgmerge
>> >> section, if we're making this core functionality.
>> >
>> > There isn't currently a merge section as far as I know, only ui.merge.
>> > But I have no problem naming the new section just [merge]. Using file
>> > patterns that would look like:
>> >
>> > [merge]
>> > default = kdiff3
>> > **.html = myHtmlPlugin
>> > **.lib = takelocal
>> 
>> Why not simply
>> 
>>   *.html = foo
>>   *.lib = bar
>> 
>> I think many users would know that "*.html" means "HTML files", but many
>> would not know that "**.html" means almost the same, except that "**"
>> also includes directory separators and thus acts recursively -- if that
>> is indeed what it does here?
>
> Only to be consistent with the encode/decode filter syntax.

Ahh, good point :-)

Then I guess I think both extensions ought to be changed, although that
might be too late now.

-- 
Martin Geisler

      Do your secure multi-party computations (SMPC) with VIFF,
              the Virtual Ideal Functionality Framework.
                     Download at http://viff.dk/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20080110/2fdd6eff/attachment.pgp 


More information about the Mercurial-devel mailing list