Best practices for using git with CVS

Best practices for using git with CVS

What are your best practices and tips for using git to interface with a CVS repository?

How do I tell git to always select my local version for conflicted merges on a specific file?


git remove oldest revisions of a file
I wrote up an answer to a similar question here..
Manage home directory across multiple machines with some differences?
This works suprisingly well when you're forced to continue to push changes into a central CVS repository..
How to apply a git patch from one repository to another?

Middle-ground between submodules and branches?

How to custmoize git.el's diff face in Emacs?


Maintaining unrelated directories in one git repository
I've only worked with Git-CVS interactions to demo Git for a friend, but it was very straightforward.

How do I prevent autotools from re-generating configure script automatically?
  • You need to install a current copy of cvsps.

    Git cvsimport uses this to access CVS history.
  • We found that, for a large project, inital set-up was much faster by taking a full copy of the CVS repo onto your computer, and doing the git cvsimport locally:.
    $ rsync rsync://*   $ mkdir myproject.git   $ cd myproject.git   $ git cvsimport -p -x -v -d :local:/path/to/cvsroot/yourproject  
Note that the -x after -p is very important.

This passes -x to cvsps.

For more information please see the cvsps man page..


I wrote up the details of my own workflow for remote CVS, local Git.


Slightly meta-answer.

If you are forced to use git 'guerilla style', i.e.

your company is stuck using cvs for the version control and you use git on your workstation to make life easier, you might consider doing something like this;.
CVS=realCvsPath # commit to the git first if ($ARGV[0] && $ARGV[0] eq "commit") { system 'git commit -a'; }  # execute the appropriate cvs program # =================================== exec "$CVS", @ARGV 
Calling this file 'cvs' and including it the path before the real CVS command.

Otherwise you can have git commits older than the cvs ones, which isn't that useful....


If the upstream is 100% in CVS (e.g., OpenBSD, or many of its subprojects like mdocml or ports-readmes), and especially if it's as rusty as the OpenBSD CVS tree is (e.g., occasionally even having history rewrite), I find it quite useful to simply commit the underlying CVS/{Entries,Repository,Root} files directly into my git repository.. This makes it very easy to not have to have multiple independent workspaces, make it possible to checkout with git on any machine, and then cvs up in place, or cvs diff to generate correct CVS patches for mailing to the git-less maintainers upstream..

92 out of 100 based on 72 user ratings 422 reviews