Getting CVS and Git to play nicely in the same box

[Alex Bennee <kernel-hacker@bennee.com>]

Hi,

I'm trying to get a setup where I can use git for my day to day coding
on problems but still mirror a CVS repo. The situation is muddied
slightly by the way we manage changes in our CVS repository and
baselines.

The CVS manner of working means we create a branch at a given point to
do work on it:

          BL1_CH2
         /
        /
       BL1_CH1
BL1---/

And then in the meantime a new baseline may be released:


BL2    BL1_CH2
|     /
|     BL1_CH1
BL1--/

So we employ the "cvs -q update -dP -j BL1 -j BL2" on our development branch
          
          BL2_CH2
         /
BL2     BL1_CH2
|      /
|    BL1_CH1
BL1--/

I want to mirror this sort of behaviour it git (basically making the 
cvs -j -j operation a git merge, separate from the normal development track). 
I however also need to maintain the CVS meta-data so when I get to given points
I can commit my work into the main development server.

I can set up a git repo that ignore all the CVS gubbins with exclude info but the
CVS metadata gets in the way. I think I have to maintain two git repos, one that tracks the
baseline and one which is a clone (which can then pull updates) but has the CVS meta data
for my development branch. However CVS does seem to get very confused when the world moves
under it when you switch branches in GIT.

Has anyone successfully set up such a working environment? Can anyone offer any tips on how to
make it all work nicely?

-- 
Alex, homepage: http://www.bennee.com/~alex/
To iterate is human, to recurse, divine.