AccuRev is a proprietary Java based version control system with much better branch support than CVS, and that has hierarchical version control. Its also has a command line interface and tool integration but it is not as good as CVS.

It is more than just a search and replace: it lets you rename a file or package in one operation, changing the file, the type name, all dependent classes, and even the imports.