[gentoo-dev] Diff alternatives for etc-update (WAS: etc-update & ._cfg* files: major issue with gentoo?)

[Dylan Carlson <absinthe@pobox.com>]

On Saturday 11 January 2003 05:14am, Kai Großjohann wrote:
>
> (I agree with the other posters that diff3 is even /more/ useful, but
> that's easy to add once the right version (A) is available.)

I posted this in -user, but will do so again here... I believe one of the 
easier things we can do is add support for other diff utils in 
/etc/make.conf/.  kompare, kdiff3, gtkdiff, whatever...

It's faster & easier to parse things (particularly large files) accurately 
with a GUI diff util.  kdiff3 also allows you to type into the merge file 
freeform (in case you want to make a few more manual changes not in either 
file being diffed).

/etc/make.conf examples:

DIFFCOMMAND=/usr/bin/kdiff3 ${FILE1} ${FILE2} ${FILE3} -o ${MERGEFILE}

DIFFCOMMAND=/usr/bin/gtkdiff ${FILE1} ${FILE2} ${FILE3} -o ${MERGEFILE}

DIFFCOMMAND=cp ${FILE1} ${MERGEFILE} && /usr/bin/kde/3.1/bin/kompare 
${MERGEFILE} ${FILE2}

// Kompare doesn't have an -o option... it merges changes back into the
// first file specified on the commandline.  or the changes can be saved as
// a .diff file.

Ebuilds?  Yes.

* gtkdiff is in app-misc/gtkdiff
* kdiff3 is in dev-util/kdiff3
* kompare is part of kde-base/kdesdk

Cheers,
Dylan Carlson [absinthe@pobox.com]

--
gentoo-dev@gentoo.org mailing list