From: Kyle McMartin <kyle@mcmartin.ca>
To: Lin Mac <mkl0301@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>, linux-kernel@vger.kernel.org
Subject: Re: How do I ignore the changes made by CVS keyword substitution efficiently?
Date: Thu, 3 Jun 2010 15:35:27 -0400 [thread overview]
Message-ID: <20100603193527.GK28492@bombadil.infradead.org> (raw)
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
next prev parent reply other threads:[~2010-06-03 19:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-03 19:13 How do I ignore the changes made by CVS keyword substitution efficiently? Lin Mac
2010-06-03 19:35 ` Kyle McMartin [this message]
2010-06-03 19:50 ` Lin Mac
2010-06-04 7:13 ` Steven Michalske
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100603193527.GK28492@bombadil.infradead.org \
--to=kyle@mcmartin.ca \
--cc=git@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkl0301@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).