Proposal: discourage packagers from enabling merge-tool configs

Augie Fackler raf at durin42.com
Wed Mar 11 15:23:35 CDT 2015


On Mar 11, 2015, at 3:02 PM, Matt Mackall <mpm at selenic.com> wrote:

> On Wed, 2015-03-11 at 11:12 -0400, Augie Fackler wrote:
>> From IRC just now:
>>> 11:07 < newdan> durin42, well yesterday I had some help figuring out how to 
>>>                make rebase work more like git when conflicts happen (by 
>>>                default on my box it opens up gvimdiff which I don't know, and 
>>>                :qall-ing out made me actually lose some of my work)
> 
> Gvimdiff, like every program with 'vi' in its name, is an abomination, I
> think we can all agree..
> 
>> This has burned me too. I believe our current position is that we
>> think packagers should enable all the merge tools. I think that's
>> dangerous for the above reason. Can we change that to recommend
>> including it as a documentation sample, but to not enable them by
>> default?
> 
> ..but this may be _the single largest end-user regression ever proposed
> on this list_. Really, you want to break everyone's merge setup, not
> just the poor bastards with vim on their systems?

I'm assuming that the canned tool configs are only ever surprising when a tool is installed without someone's knowledge. Then again, I'm on the bizarro platform where everything is terrible anyway.

> 
> Vimdiff now explains how to properly quit, at a minimum we need to fix gvimdiff to do the same:
> 
> vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \
> \":cq\" to abort vimdiff"'

I'll spend some time to fix this, it'll fix enough of my objection that I'll be satisfied (at least until some other tool manages to be as confounding as gvimdiff.)

> 
> -- 
> Mathematics is the supreme nostalgia of our time.
> 
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20150311/d77abff8/attachment.pgp>


More information about the Mercurial-devel mailing list