Moving branch to trunk

[Ed Swierk]

A long time ago, we started a new branch that has since become the main 
development line.  A few changes occurred on the trunk as well but that line 
has effectively died out.

Now I would like to merge everything from the branch into the trunk, 
ignoring any changes made in the trunk since the branch was created and 
removing any files in the trunk that are not present in the branch.  I 
understand that cvs update -j does the merge, but I would like to know if 
there is anything I should do first to make it proceed smoothly.  Ideally 
there should be no conflicts at all, and the end result should be that the 
trunk is identical to the branch (modulo RCS keywords).

What would happen if I cvs remove'd all the files in the trunk before 
merging from the branch?

--Ed