| 1 |
On 09/27/2012 01:36 PM, Pacho Ramos wrote: |
| 2 |
> El jue, 27-09-2012 a las 13:21 -0700, Zac Medico escribió: |
| 3 |
>> On 09/27/2012 01:16 PM, Pacho Ramos wrote: |
| 4 |
>>> El dom, 23-09-2012 a las 11:06 -0700, Zac Medico escribió: |
| 5 |
>>>> On 09/23/2012 03:59 AM, Pacho Ramos wrote: |
| 6 |
>>>>> This looks like could be done with: |
| 7 |
>>>>> # Automerge files comprising only whitespace and/or comments |
| 8 |
>>>>> # (yes or no) |
| 9 |
>>>>> replace-wscomments=no |
| 10 |
>>>>> |
| 11 |
>>>>> , setting it to "yes" in dispatch-conf.conf |
| 12 |
>>>> |
| 13 |
>>>> It seems like that option is only likely to benefit people who have |
| 14 |
>>>> disabled the default config-protect-if-modified FEATURES setting, and |
| 15 |
>>>> I'm not sure that it's a good idea to hide "trivial" differences from |
| 16 |
>>>> these people by default. |
| 17 |
>>> |
| 18 |
>>> Would be a way to detect changes like "0" to "1" or "false" -> "true", |
| 19 |
>>> "yes" -> "no"... ? I think they usually shouldn't be changed :| |
| 20 |
>> |
| 21 |
>> I'm not sure what "problem" you're trying to solve. Since enabling |
| 22 |
>> FEATURES=config-protect-if-modified, I've found the volume of config |
| 23 |
>> updates to be much more manageable, and the configs that I do have to |
| 24 |
>> merge manually don't really bother me. |
| 25 |
> |
| 26 |
> Well, I hit the problem when updating from stable openrc to 0.10.5 and |
| 27 |
> needing to reedit some config files as, as normal, I had uncommented |
| 28 |
> some options, modified some defaults... (like keymap, clock settings...) |
| 29 |
|
| 30 |
I think this comes back to a limitation of that DIFF3_MERGE command that |
| 31 |
we discussed earlier in this thread, since it's failing to automatically |
| 32 |
merge your local changes. If there's some better tool for doing the |
| 33 |
merge, then make it so you can use that instead of diff3. |
| 34 |
-- |
| 35 |
Thanks, |
| 36 |
Zac |
Archives