Brett Lymn <blymn@baesystems.com.au> writes:


> This may be an egg sucking demonstration but you _are_ importing the
> NetBSD sources onto the vendor branch of your repository aren't you?

Yes.

> CVS should then be able to merge the updated NetBSD source with your
> local changes - you will probably get some conflicts but most of it
> should be automatic.

We use Perforce. And yes, most of it is automagic. Typically a month
sees a few hundred files changed and I end up with about 20 that need
hand editing.