In addition to the great answers above, you may find the following document helpful: http://openacs.org/projects/dotlrn/dotlrn-doc/dotlrn-cvs (recently brought over from the old sdm site to openacs.org by Carl B.). Don't let the dotLRN part of the title throw you off. It's really about using CVS vendor branches and merging.