From: Linus Torvalds <torvalds@osdl.org>
Date: Fri, 01 Dec 2006 07:44:41 GMT
Subject: Re: Diffs from CVS keyword expansion
Message-ID: <Pine.LNX.4.64.0611302340030.3695@woody.osdl.org>
In-Reply-To: <17775.54363.376000.140259@lapjr.intranet.kiel.bmiag.de>



On Fri, 1 Dec 2006, Juergen Ruehle wrote:

> Jon Smirl writes:
>  > Anyone have a nice script for suppressing diffs caused by CVS keyword
>  > expansion when someone checked the kernel sources into CVS?
> 
> I usually just say (with GNU diff)
> 
>   diff -I $$ ...
> 
> which is crude, but should be enough to get rid of the hunks listed by
> you.
> 
> You might also want -x CVS if you have the metadata files.

Also, if you are actually _using_ CVS to check it out, use

	cvs co -ko

I think, to not check out with keyword expansion at all.

(Also usable with "cvs diff -ko", I think)

		Linus

PS. Clueless user alert: I have happily not used CVS in years and years,