removing from trunk/branch

[Rob Helmer]

Hello,


I've recently done a merge ( branch -> trunk ) and noticed
that alot of files were removed from the branch, but not
from the trunk.

I ran a cvs log and pulled up filenames for all files in a
"dead" state, which is somewhat tedious to go through,
but works ( I can tell from the commit messages whether
it had a dead revision because it was added on the branch,
or whether it was purposely removed from the branch ).

So I have a couple questions :

Is there a single command I can use to remove files from
both the trunk and the branch? "cvs remove" doesn't seem
to take many parameters.

Also, is this the right way to go about this? I basically
want to take all the work done on the branch the last couple
months, and move it to the trunk ( where seperate, but "unstable"
work has been happening ).

How should I deal with these files removed on the branch only?



Thanks,
Rob Helmer