From: Kyle McMartin <kyle@mcmartin.ca>
Date: Thu, 03 Jun 2010 19:35:27 GMT
Subject: Re: How do I ignore the changes made by CVS keyword substitution efficiently?
Message-ID: <20100603193527.GK28492@bombadil.infradead.org>
In-Reply-To: <AANLkTilhvjn1ypRoKs2CxJdA1zDkaT5i64vh0ZtfjwMk@mail.gmail.com>

On Fri, Jun 04, 2010 at 03:13:29AM +0800, Lin Mac wrote:
> I'm merging kernel from others, and they used CVS to manage their
> code, and so do some part of linux kernel. Unfortunatly CVS would
> substitude the keywords in the source, result in unecessary changes in
> the code, like the one in the following diff. In fact, there are
> around 1174 of CVS keywords in the kernel source. I don't want those
> useless changes to get into my tree.

You want the -ko option to cvs checkout/update which will use the
original keywords from the import.

regards, Kyle