git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
To: Lars Alexander Noschinski <Lars.Noschinski@rwth-aachen.de>
Cc: git@vger.kernel.org
Subject: Re: cvsexportcommit and cvsimport's -k option
Date: Tue, 29 Apr 2008 21:46:42 +0200	[thread overview]
Message-ID: <200804292146.42262.robin.rosenberg.lists@dewire.com> (raw)
In-Reply-To: <f6c6e2a5cc39.481773ba@rwth-aachen.de>

tisdagen den 29 april 2008 19.15.06 skrev Lars Alexander Noschinski:
> ... hack away ...
> git-cvsimport -i -r cvs -kk -v -d $CVSREPOS
> git-rebase cvs # If work was done in the meantime
> git-cvsexportcommit -cpuv $COMMIT # Multiple times, if necessary
> git-cvsimport -i -r cvs -kk -v -d $CVSREPOS
> git-checkout -b master cvs # commit ids are changed now
>
> As far as I am concerned, this works fairly well, accept when for any
> reason a line containing a CVS keyword (e.g. $Id$) is contained in a
> changeset. In this case, patching fails, and I have to investigate why it
> fails, eventually just copying the old version from the cvs repository.
>
> Would it be possible to add an option to cvsexportcommit to detect such
> killed keywords and ignore them?

Sure, but is it necessary? If the cvs checkout you use is checked out
with -kk there shouldn't be any problem.

If not, start by thinking up a few testcase for inclusion in 
t9200-git-cvsexportcommit.sh that illustrates the problem. Then we can
change cvsexporcommit until the new tests pass.

-- robin

  reply	other threads:[~2008-04-29 19:47 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-29 17:15 cvsexportcommit and cvsimport's -k option Lars Alexander Noschinski
2008-04-29 19:46 ` Robin Rosenberg [this message]
2008-05-02 20:11   ` Lars Noschinski

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=200804292146.42262.robin.rosenberg.lists@dewire.com \
    --to=robin.rosenberg.lists@dewire.com \
    --cc=Lars.Noschinski@rwth-aachen.de \
    --cc=git@vger.kernel.org \
    /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).