Eric Haszlakiewicz <erh@swapsimple.com> writes:

> hmm... perhaps using an intermediate cvs repository to do the merges
> would make things easier:
> 	copy checked out files from perforce into cvs working directory
> 	check those in to cvs main branch as a normal change
> 	import new netbsd code onto cvs vendor branch
> 	merge into cvs main branch
> 	copy merged files back to perforce

That turns out to be more work that the way we do it, which is

* checkout cvs tree
* use scripts to merge checked out tree into perforce's idea of a vendor
  branch
* use perforce's branch merging to merge into our working tree