[PATCH 11 of 11 V2] filemerge: use 'basic' as the default of '[ui] mergemarkers' for safety

[Shun-ichi Goto]

2014-07-19 9:59 GMT+09:00 Matt Mackall <mpm at selenic.com>:
> On Fri, 2014-07-18 at 20:13 -0400, Augie Fackler wrote:
>> On Jul 18, 2014, at 4:33 PM, Matt Mackall <mpm at selenic.com> wrote:
>>
>> > On Sun, 2014-07-06 at 03:00 +0900, FUJIWARA Katsunori wrote:
>> >> # HG changeset patch
>> >> # User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
>> >> # Date 1404583001 -32400
>> >> #      Sun Jul 06 02:56:41 2014 +0900
>> >> # Node ID f5d064452b9b7fa6c001c5f92baf7ae1c34fd8a0
>> >> # Parent  21eb3ac84075d72de5adc097f8fe4bfe1f66c1b8
>> >> filemerge: use 'basic' as the default of '[ui] mergemarkers' for safety
>> >
>> > Ok, it looks like we've got no choice but to switch back. This is queued
>> > for default, thanks. And special thanks to everyone involved for testing
>> > the default branch and finding this issue before the release.
>>
>> Would it be welcome to advertise [ui] mergemarkers = detailed in hg config --edit's new user setup?
>
> I guess the strategy this cycle is to see if my merge marker dislike is
> stored in a signed int and can be overflowed. It's 64-bits, folks.

I have one idea (no code yet).
We can add new style 'detail-safe' (or replacing 'detail') which fallback
to 'basic' when its text have non-ASCII (in desc, tag, branch, etc.).
I guess this style can be default.

-- 
Shun-ichi GOTO