* [gentoo-user] dispatch-conf merge
@ 2009-06-03 5:21 Graham Murray
2009-06-03 5:34 ` Roy Wright
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Graham Murray @ 2009-06-03 5:21 UTC (permalink / raw
To: gentoo-user
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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [gentoo-user] dispatch-conf merge
2009-06-03 5:21 [gentoo-user] dispatch-conf merge Graham Murray
@ 2009-06-03 5:34 ` Roy Wright
2009-06-03 7:30 ` Volker Armin Hemmann
2009-06-03 7:52 ` Neil Bothwick
2 siblings, 0 replies; 5+ messages in thread
From: Roy Wright @ 2009-06-03 5:34 UTC (permalink / raw
To: gentoo-user
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [gentoo-user] dispatch-conf merge
2009-06-03 5:21 [gentoo-user] dispatch-conf merge Graham Murray
2009-06-03 5:34 ` Roy Wright
@ 2009-06-03 7:30 ` Volker Armin Hemmann
2009-06-03 7:52 ` Neil Bothwick
2 siblings, 0 replies; 5+ messages in thread
From: Volker Armin Hemmann @ 2009-06-03 7:30 UTC (permalink / raw
To: gentoo-user
On Mittwoch 03 Juni 2009, 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.
try cfg-update. It is way smarter than dispatch-conf.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [gentoo-user] dispatch-conf merge
2009-06-03 5:21 [gentoo-user] dispatch-conf merge Graham Murray
2009-06-03 5:34 ` Roy Wright
2009-06-03 7:30 ` Volker Armin Hemmann
@ 2009-06-03 7:52 ` Neil Bothwick
2009-06-03 15:58 ` Peter Humphrey
2 siblings, 1 reply; 5+ messages in thread
From: Neil Bothwick @ 2009-06-03 7:52 UTC (permalink / raw
To: gentoo-user
[-- Attachment #1: Type: text/plain, Size: 787 bytes --]
On Wed, 03 Jun 2009 06:21:10 +0100, 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.
I switched from dispatch-conf to conf-update a while ago and much prefer
it. The merging is more flexible and rarely has problems as you describe.
--
Neil Bothwick
Age and treachery will always overcome youth and skill.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [gentoo-user] dispatch-conf merge
2009-06-03 7:52 ` Neil Bothwick
@ 2009-06-03 15:58 ` Peter Humphrey
0 siblings, 0 replies; 5+ messages in thread
From: Peter Humphrey @ 2009-06-03 15:58 UTC (permalink / raw
To: gentoo-user
On Wednesday 03 June 2009 08:52:22 Neil Bothwick wrote:
> I switched from dispatch-conf to conf-update a while ago and much prefer
> it. The merging is more flexible and rarely has problems as you describe.
Well I'm still using etc-update. The only difficult case is when squid is
updated on my proxy box, and that's because of the sheer size of its config
file. I handle this one myself.
--
Rgds
Peter
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-06-03 16:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-03 5:21 [gentoo-user] dispatch-conf merge Graham Murray
2009-06-03 5:34 ` Roy Wright
2009-06-03 7:30 ` Volker Armin Hemmann
2009-06-03 7:52 ` Neil Bothwick
2009-06-03 15:58 ` Peter Humphrey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox