Home

THIS CODE IS NOT ACTIVELY USED BY THE AUTHOR

Welcome to the CVSgit wiki!

This provides project provides two scripts: cvs2git and git2cvs.

cvs2git calls git-cvsimport to pull a CVS repository into a local Git repository separate from you working repository.
git2cvs calls git-cherry and git-cvsexportcommit to push your locally committed changes back up to the CVS repository.

There are a couple of steps that I have been playing with back and forth for the default behavior:

1) automatically merge CVS changes back into the current working copy vs.
2) require you to either manually git-merge cvs/master or git reset —hard cvs/master

Both of these choices have valid use cases. I will probably leave the default behavior to “do nothing” but add options which will direct cvs2git to automatically attempt one of the two cases in option #2.

SINCE ORIGINALLY DEVELOPING THIS CODE, MY EMPLOYER HAS MOVED TO USING GIT DIRECTLY. I AM NO LONGER USING THIS CODE OR DEVELOPING NEW FUNCTIONALITY. IF YOU WISH TO USE IT AND FIND IT USEFUL, PLEASE FORK IT AND CONTINUE DEVELOPMENT ON IT.