Project

General

Profile

Using cvs2git

Some users have expressed an interest in migrating their existing CVS repositories
to Git. This wiki page will attempt to walk you through the process. We'll be showing
the commands you type and the output you get in the following format:

command you type
output you get

Overview

There are a few steps to converting CVS modules to Git here on cdcvs:

  • Finding your existing cvs module
  • checking for space requirements
  • environment setup
  • running cvs2git
  • undumping into the repository
  • cleanup

We'll go through them in detail.

Finding your existing module

You need to know the $CVSROOT value for your repository for this part. You can look in a checked-out
copy at the CVS/Root file if you're not sure what it is. The examples here will be as if you had a Redmine-created
repository 'myproject', which would have a $CVSROOT value of /cvs/projects/myproject.

You want to ssh into cdcvs using the user@cdcvs part of your $CVSROOT.

ssh p-myproject@cdcvs.fnal.gov
Last login: ...

Then change directories to the directory part of your $CVSROOT.

cd /cvs/projects/myproject
ls
CVSROOT myproject

Check for space

There needs to be at least double the space your package takes free for the conversion.

du -sk myproject
800 myproject
df -k .
Filesystem   1K-blocks     Used Available Use% Mounted on
blue1:/cdcvs 314572800 240312928 74259872 77% /cvs

So the Available space (the 74259872 in the above example) must be atleast double the size of the project (800 in the above example) to consider proceeding. If it isn't, or it's within 10% or so, please put in a servicedesk ticket, and ask us to grow the filesystem.

Setup your environment

You'll probably need to use the cvs 1.12 that we use behind Redmine to do the conversion, and with
our /usr/local/bin/cvs_wrap script to hide some WARNINGS it gives that cvs2git doesn't like.

. /fnal/ups/etc/setups.sh
setup cvs v1_12_13p1
echo $CVS_DIR
/fnal/ups/db/../prd/cvs/v1_12_13p1/Linux-2
setup git
echo $GIT_UPS_DIR
/fnal/ups/db/../prd/git/v1_6_4/Linux-2

Run the cvs2git tool

cvs2git \
  --blobfile=cvs2svn-tmp/git-blob.dat \
  --dumpfile=cvs2svn-tmp/git-dump.dat \
  --username=cvs2git \
  --cvs=/usr/local/bin/cvs_wrap \
  --cvs=/usr/local/bin/cvs_wrap \
  `pwd`/my-module
Examining all CVS ',v' files...
/cvs/projects/myproject...,v
/cvs/projects/myproject...,v
...
Timings (seconds):
------------------
9.43 pass1 CollectRevsPass
0.03 pass2 CleanMetadataPass
0.01 pass3 CollateSymbolsPass
...
10.05 total

Then actually setup the git repository, and pull in the dump that cvs2git made

mkdir myproject.git
cd myproject.git
git init --bare --shared
git update-server-info
cat ../cvs2svn-tmp/git-blob.dat ../cvs2svn-tmp/git-dump.dat | git fast-import
git gc --prune=now

Setup for http access

cd myproject.git/hooks
mv post-update.sample post-update

Clean up

cd ..
rm -rf cvs2svn-tmp

Update Redmine

If your repository is affiliated with a Redmine project, you can now set Redmine to look at your new repository.

  • Go to the Settings tab of your project
  • Click on the Repositories sub-tab.
  • Click on the Delete link next to the current repository (this doesn't delete the actual files, just Redmine's info about where the repository is).
  • Click the New repository link
  • Choose "Git" for the SCM
  • Check the Main Repository checkbox
  • Put the full path to your new my-project.git directory in the Path to repository box.
  • Click Save