as far as i can tell, the only way to *really* avoid this "cvs import
immediately screws the tree" lossage is to run "cvs ci -f" on the tree
*before* every import, as this will cause a new revision to be created
for the file, thus causing no files to be left on the vendor branch by
default.  actually, you probably don't need it every import, but due
to, eg, new files, you need to check every time for them it is probably
easier to just cvs ci -f every time.


but it means that every changed (on the vendor branch) file will need
to be merged (hopefully via the cvs co -j -j), rather than only changed
(on the trunk) files.