And for those of us who use our own cvs tree to track the sources, I'm
   currently working on modifications to cvs to allow it to sanely handle
   branches in a vendor source being tracked via import (e.g. allowing imports
   and local modifications on both branches...)


i fail to understand the point of this.  CVS handles branches on
branches OK.  branches can come off any revision.  CVS just handles
the `1.1.1' branch specially when doing `cvs import'.