Re: cvsexportcommit and cvsimport's -k option

From: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Date: Apr 29, 2008, 19:46 UTC
Message-ID: <200804292146.42262.robin.rosenberg.lists@dewire.com>
In-Reply-To: <f6c6e2a5cc39.481773ba@rwth-aachen.de>

tisdagen den 29 april 2008 19.15.06 skrev Lars Alexander Noschinski:

Show 14 quoted lines

> ... 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