Bug 47643

Summary:	etc-update.conf: 3-way-merge
Product:	Gentoo Linux	Reporter:	Niels Teglsbo <niels>
Component:	New packages	Assignee:	Portage team <dev-portage>
Status:	RESOLVED DUPLICATE
Severity:	enhancement
Priority:	High
Version:	1.4
Hardware:	All
OS:	All
Whiteboard:
Package list:		Runtime testing required:	---

Description Niels Teglsbo 2004-04-12 15:42:47 UTC

I think the merging of config files would be a lot easier if it was a 3-way-merge, ie. a merge where you have the old default version, the new default version and then you own hacked version.

Using a 3-way-merge you would be able to accept any changes made to the default config file where you haven't touched anything yourself and on the other hand know when you have touched something that is changed to something else in the new default config.

You can use diff3 for this: diff3 hacked-config old-def-config new-def-config -m

The problem is then, that you need to keep the old-def-config, but that should be relatively easy with ebuild/emerge, when a package is installed or upgraded the default config from that package should be saved somewhere (in /etc/.defconfig or whatever).

Comment 1 Niels Teglsbo 2004-05-30 16:58:08 UTC

dispatch-conf seems to do something like what I suggested.

*** This bug has been marked as a duplicate of 11763 ***