From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10307 invoked by uid 1002); 11 Jan 2003 15:22:55 -0000 Mailing-List: contact gentoo-dev-help@gentoo.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@gentoo.org Received: (qmail 20005 invoked from network); 11 Jan 2003 15:22:54 -0000 From: Dylan Carlson Reply-To: absinthe@pobox.com To: kai.grossjohann@uni-duisburg.de (Kai =?iso-8859-1?q?Gro=DFjohann?=), gentoo-dev@gentoo.org Date: Sat, 11 Jan 2003 10:19:34 -0500 User-Agent: KMail/1.5 References: <33052.192.168.0.8.1041817268.squirrel@webmail.codewordt.co.uk> <1042239936.31293.3.camel@rattus.localdomain> <84d6n49en7.fsf@lucy.cs.uni-dortmund.de> In-Reply-To: <84d6n49en7.fsf@lucy.cs.uni-dortmund.de> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit Content-Disposition: inline Message-Id: <200301111019.34624.absinthe@pobox.com> Subject: [gentoo-dev] Diff alternatives for etc-update (WAS: etc-update & ._cfg* files: major issue with gentoo?) X-Archives-Salt: 9ccffc92-0656-4ec6-a4fa-c76676f2e581 X-Archives-Hash: 4cf73704f4ffae25555633c5b335b979 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