[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gentoo-portage-dev
Subject:    Re: [gentoo-portage-dev] How to prevent dispatch-conf from reverting valid changes
From:       Zac Medico <zmedico () gentoo ! org>
Date:       2012-09-27 20:41:51
Message-ID: 5064BA0F.9080704 () gentoo ! org
[Download RAW message or body]

On 09/27/2012 01:36 PM, Pacho Ramos wrote:
> El jue, 27-09-2012 a las 13:21 -0700, Zac Medico escribió:
>> On 09/27/2012 01:16 PM, Pacho Ramos wrote:
>>> El dom, 23-09-2012 a las 11:06 -0700, Zac Medico escribió:
>>>> On 09/23/2012 03:59 AM, Pacho Ramos wrote:
>>>>> This looks like could be done with:
>>>>> # Automerge files comprising only whitespace and/or comments
>>>>> # (yes or no)
>>>>> replace-wscomments=no
>>>>>
>>>>> , setting it to "yes" in dispatch-conf.conf
>>>>
>>>> It seems like that option is only likely to benefit people who have
>>>> disabled the default config-protect-if-modified FEATURES setting, and
>>>> I'm not sure that it's a good idea to hide "trivial" differences from
>>>> these people by default.
>>>
>>> Would be a way to detect changes like "0" to "1" or "false" -> "true",
>>> "yes" -> "no"... ? I think they usually shouldn't be changed :|
>>
>> I'm not sure what "problem" you're trying to solve. Since enabling
>> FEATURES=config-protect-if-modified, I've found the volume of config
>> updates to be much more manageable, and the configs that I do have to
>> merge manually don't really bother me.
> 
> Well, I hit the problem when updating from stable openrc to 0.10.5 and
> needing to reedit some config files as, as normal, I had uncommented
> some options, modified some defaults... (like keymap, clock settings...)

I think this comes back to a limitation of that DIFF3_MERGE command that
we discussed earlier in this thread, since it's failing to automatically
merge your local changes. If there's some better tool for doing the
merge, then make it so you can use that instead of diff3.
-- 
Thanks,
Zac


[prev in list] [next in list] [prev in thread] [next in thread]