A small addition: I am using a fairly simple subset of CVS commands: checkout (sometimes with -r) log -r rtag update (sometimes with -C, -P, -d) and commit in their simplest form, mostly from WinCVS. I never merge cvs branches.