Re: cvsimport: trying to convert freebsd cvs to git

From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Dec 23, 2007, 21:13 UTC
Message-ID: <46a038f90712231313k3d17a30bwa910dd9679851c92@mail.gmail.com>
In-Reply-To: <20071223172913.GA9297@sigill.intra.peff.net>

On Dec 24, 2007 6:29 AM, Jeff King <peff@peff.net> wrote:

Show 13 quoted lines

> On Sat, Dec 22, 2007 at 06:18:01PM +0100, Miklos Vajna wrote:
>
> > then i tried:
> >
> > $ time git cvsimport -d `pwd`/cvs -C src.git src
> > Initialized empty Git repository in /home/vmiklos/git/freebsd/src.git/.git/
> > malformed revision
>
> This is the actual error; everything else is git-cvsimport failing to
> notice the problem and continuing anyway.
>
> I will take a look and see if it is simple to stop the process here and
> produce a better error message.

Indeed. Running verbose will name the branch name that triggers that error. One thing I find useful is to capture the commandline passed to cvsps (using ps), stopping cvsimport+cvsps, and running cvsps by hand with the same commandline (remember to set TZ=UTC in the environment!), saving STDOUT to a file.

Once you have the file, you can feed it to cvsimport with the -P parameter (IIRC). Usually cvsimport errors are all about wonky cvsps output.

For the record, I normally do my initial imports with Keith's parsecvs, and then run incrementals using git-cvsimport. These incrementals aren't 100% perfect, so I routinely check for 'drift'.

cheers,