From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MBj7p-0000QX-PR for garchives@archives.gentoo.org; Wed, 03 Jun 2009 05:34:58 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EEEADE03B8; Wed, 3 Jun 2009 05:34:55 +0000 (UTC) Received: from smtprelay.hostedemail.com (smtprelay0220.hostedemail.com [216.40.44.220]) by pigeon.gentoo.org (Postfix) with ESMTP id D9930E03B8 for ; Wed, 3 Jun 2009 05:34:55 +0000 (UTC) Received: from filter.hostedemail.com (ff-bigip1 [10.5.19.254]) by smtprelay01.hostedemail.com (Postfix) with SMTP id A0A7912BF7C3; Wed, 3 Jun 2009 05:34:55 +0000 (UTC) X-Session-Marker: 726F79407772696768742E6F7267 X-Filterd-Recvd-Size: 1860 Received: from royw-macbook.wright.local (Port22.TB3.industryinet.com [66.63.237.22]) (Authenticated sender: roy@wright.org) by omf02.hostedemail.com (Postfix) with ESMTP; Wed, 3 Jun 2009 05:34:55 +0000 (UTC) Message-Id: <9F0D6078-DBB3-4820-B498-85A7F7B0DD30@wright.org> From: Roy Wright To: gentoo-user@lists.gentoo.org In-Reply-To: <87zlcpc2pl.fsf@newton.gmurray.org.uk> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Subject: Re: [gentoo-user] dispatch-conf merge Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-user@lists.gentoo.org Reply-to: gentoo-user@lists.gentoo.org Mime-Version: 1.0 (Apple Message framework v930.3) Date: Wed, 3 Jun 2009 00:34:53 -0500 References: <87zlcpc2pl.fsf@newton.gmurray.org.uk> X-Mailer: Apple Mail (2.930.3) X-Archives-Salt: 0d7eb317-2f07-4059-ab00-047423db00ac X-Archives-Hash: 1c8f7c524920b6603aafde47a6f081a1 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