Re: The problem with Subversion
We are looking into switching from CVS to SubVersion. It provides the ability to do atomic commits; the branching is better, etc. It has plug-ins for most things (i.e. Eclipse, Windows Shell, has it's own GUI, etc.). The import from CVS shouldn't be too difficult (though I expect the importing of branches to be a little tricky, but I don't have first-hand knowledge of this).
It's also being used more and more by open source projects, which I expect to continue (might even go so far as to say that as it improves, CVS will give way to SubVersion).