yes i guess it will be good to use CVS (although i have not used it before o_O ).
btw, a little off-topic but stefan: are u the guy which develops that dune remake arrakis? i'm a big fan of Dune2