A very old question, but Netbeans now has a CVS function.
Go to Tools> Plugins and find CVS and install.
After that, it is very simple to right-click on the directory, go to the tools, and then apply the diff patch. This will fix all the files in the diff file in this directory. Simple and sleek.
Matthew hilgenfeld
source share