> How can I make cvs just do the merging that it does with `cvs
> import' and then be able to hack the rest of the pieces into shape
> before comitting the whole thing?

You can run "cvs admin -b1.1" on each file in the affected directory
(unfortunately, "cvs admin" won't accept a numeric revision for
multiple files) before each import (or after each import).  That will
cause all files to be flagged as a conflicts on import.  This method
is somewhat simpler than mrg's proposed "cvs ci -f" answer, and it has
the additional benefit of being idempotent.

However, don't do this in the NetBSD repository without clearing it
with the NetBSD repository maintainers (I don't know if that's core or
TNF or admin).