If there is a clear solution to this problem, it's to hack the
official NetBSD source so that each file starts with:

/* $NetBSD: ... $
   $Id: ... $ */

The version of cvs running on sun-lamp is then hacked to *only* update
the $NetBSD: $ line, not the $Id: $line.   Local versions of cvs
update the $Id: $ line, and not the $NetBSD: $ line.

I am fairly certain that there's an option to cvs diff that allows you
to exclude the ID line differences, so that patches that you submit
can be applied to the master tree.   If not, I'll gladly volunteer to
put it in - I used to hack cvs for a living, so I know where most of
the skeletons are buried.

Speaking of which, how come there isn't a NetBSD distribution of cvs?
This seems like the sort of thing that a lot of NetBSD hackers would
want to have around...

			       _MelloN_
--
Ted Lemon							 mellon@vix.com
+1 415 477 5045

Fight to preserve your freedom to program: Join the League for
Programming Freedom!   For info, contact lpf@uunet.uu.net.