From: Jon Smirl <jonsmirl@gmail.com>
Date: Fri, 01 Dec 2006 15:33:03 GMT
Subject: Re: Diffs from CVS keyword expansion
Message-ID: <9e4733910612010733x4dea2451r6fc64d2e867735a@mail.gmail.com>
In-Reply-To: <Pine.LNX.4.64.0611302340030.3695@woody.osdl.org>

On 12/1/06, Linus Torvalds <torvalds@osdl.org> wrote:
>
>
> 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.

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