To Git!
I've tried CVS. I've tried SVN. But I've fallen for Git.
Last year the Windows clients left a lot to the imagination, but now msysgit works wonderful, GUI included.
What I really like about it is that a central server is not needed. At school we cannot push commits up from our programming computer and we cannot use the school computers for programming. Git is lovely.
Branching is a breeze, commiting, cloning, everything. I don't have much experience with merging, and I don't imagine I will since we are using LabVIEW this year which pretty much eliminates the possibility of merging (binary files).
If you decide to poke around with it, you can PM me or send me an email. I'll be glad to help.
A way to manage code is a necessity! For years we just kept making copies of the project folder.. and didn't name them well. D=
http://code.google.com/p/msysgit/
http://en.wikipedia.org/wiki/Git_(software)