git-cvsimport [blah] [blah] [cvs_module]Yeah, that's right, a single module. Googling for hours didn't really reveal anything except trying to rewrite history by using git-filter-branch(1). Being a complete git-noob I decided that's a little too advanced for me. To be honest I hardly understand the man page. kampasky_ on #git gave me the golden clue: simply move the modules you want to intermingle from as many CVS repositories as you like into a common subdirectory (a new ”supermodule” so to speak) and import that. So to transform
CVSRepo1/ moduleA/ moduleB/ CVSRepo2/ moduleN/into
GitRepo moduleA/ moduleB/ moduleN/use the commands
$ cp -pR CVSRepo1 ImportRepo $ mkdir ImportRepo/git $ mv ImportRepo/module* ImportRepo/git/ $ cp -pR CVSRepo2/moduleN ImportRepo/git/ $ mkdir NewGitRepo $ git cvsimport -A authors-conv.txt -d ImportRepo -C NewGitRepo gitIf you get the dreaded “git-cvsimport: fatal: cvsps reported error” error message while trying to import be sure to read my next post tomorrow.