Re: [gentoo-user] dispatch-conf merge

[Roy Wright <roy@wright.org>]

On Jun 3, 2009, at 12:21 AM, Graham Murray wrote:

> Is there any way to improve the granularity in the merge function of
> dispatch-conf, or make it more intelligent?
>
> The particular situation where it gives me problems is in  
> configuration
> files where the value of an option has been manually changed following
> initial installation, then on an upgrade a new option is added close  
> to
> the one previously changed. In this situation, dispatch-conf almost
> invariably wants to reset the changed option line back to its default.
> When selecting 'm' to merge changes it will present a left hand side
> with the already existing value (often plus other lines) with the  
> right
> hand side with the default lines for both the existing line(s) and the
> new ones.
>

My habit when manually tweaking a config file is to copy the line then  
comment
out the original, like:

original:

foo=some default

changed to:

#foo=some default
foo=bar

this seems to help dispatch-conf some.

For really ugly merges, I just skip in dispatch-conf, then merge using  
kdiff3.

HTH,
Roy