Re: Diffs from CVS keyword expansion

On 12/1/06, Linus Torvalds [off-list ref] wrote:

On Fri, 1 Dec 2006, Juergen Ruehle wrote:

quoted

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.

I don't have the original CVS, just a tarball snapshot with the
keywords expanded.

I'm working with the Freescale iMX21 and the Linux port for it has
never be added to the mainline kernel. I am extracting bits and pieces
of it from various vendor tarballs.

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,
and I might remember that all wrong.

-- 
Jon Smirl