> > It's not clear what a good (completely automated) way to keep a local
> > version number, keep the NetBSD version number (for ID purposes), and
> > keep the two from mixing in the master source tree.  But i think it's
> > a bad idea to change the NetBSD version id in diffs you send back.
> 
> I'm halfway reluctant to just add another line (with $Id$) following
> the $NetBSD$, because then line numbers on diff's will be off
> (also, it will mean I cannot just strip out the RCS part of the diff
> and have everything be the same), yet I'm also reluctant to forgo
> version control within my own source tree... 
> 
> Am I missing a clear solution here?

Like i said, it's not clear (to me at least) what a good way to do
this reasonably would be...  8-)

The only thing that i can think of is: "having version control within
your own source tree doesn't necessarily mean adding your own Id
markers", but i can understand why you would want to...


chris