Re: experimental conffile merge for dpkg
[ Sorry for joining the party late, but I just learnt about this thread
from DWN. ]
On Sun, Apr 27, 2003 at 02:16:02PM +0300, Jarno Elonen wrote:
> If we can agree wether or not, how and where the original conffiles should be
> saved, I'll be happy to implement 3-way merging to dpkg and write imediff3 as
> a user friendly UI for it. Opinions?
FYI: I once implemented very simple 3-way merging for conffiles. It's not
integrated with dpkg, so it relies on the admin to make a backup of the
original file by appending .orig or .dist before he starts to modify it.
You also have to run it manually after an upgrade that produced .dpkg-dist
or .dpkg-old files.
Having something like this combined with dpkg integration and automatic
archiving of the original conffiles really would be great. Maybe you can
borrow some ideas from my dpkg-confmerge if you want to implement the whole