I've had some very bad experiences with VSS integration and VS2003/2005 (it integrated so well, that detaching it from VSS desintegrated my projects several times; I needed detaching for automated builds), so from experience I wouldn't recommend it. Because my company uses VSS, I've managed to change the policy to use VSS as a stand-alone app, not integrated from VS2005 (and ever since things work rather well). Go for SubVersion. If you use Borland Developer Studio, you can use VSS from within BDS with VssConnexxion, that on the other hand works rather well and doesn't mess up your project. Microsoft should have a look at it and rework its integration with VSS. If you are using Delphi, you can also use VssConnexxion to integrate with VSS.