It's probably better to look towards subversion, http://subversion.tigris.org/ for new features, isn't it?
I think you are right. But it depends on how soon subversions gets up and running, proven and has some troll-friendly point&click client interface.
Best regards,
Ludovic