git-cvsimport: missing branches

Hello

I need to use CVS with a history of about 20 years (someway back it was converted from SCCS to CVS). I have to stay in sync with the CVS repository to import changes from co-workers and to eventually commit changes back. I do have access to the RCS ',v' files.

So, git-cvsimport is exactly what I was looking for. Except, if I do a git-cvsimport I have a couple of branches missing, and I don't know why.

I see the branch names from cvsps in the output, but somehow git-cvsimport skips them anyway. I tried to add a branch manually which got mit a couple of years of history back, but then it stops anyway.

I used cvs2git from http://cvs2svn.tigris.org which shows me these missing branches.

So, my questions are:

- Is the problem in cvsps or git-cvsimport or in the CVS history?
- Can I use the cvs2git import as a starting point and later use 
git-cvsimport for incrementally update the git repository?
- Can I somehow compare the result of git-cvsimport and cvs2git to see 
differences?
- Is there any other feasible workflow to stay in sync with a CVS 
repository with a large history while still using git behind the scene?

Any pointers appreciated.

Regards, Reto