And from then on, updates to the vendor branch will prevail? Excellent!
Actually, no. CVS doesn't know where your commits came from, it just knows that you're off the vendor branch and committed some stuff. As far as I know, there is no way to get back to the virginal state short of hacking the repository files. If you find a way, let me know! OTOH, merging is really easy if all of your files match the vendor branch since there will be no conflicts.
