Which version control is best for this list of requirements

Question

Our development team is small (3 developers) and windows.
I am looking for a control source that can do the following:

Check the files for editing and let others know that the file is being used.
Check files and merge them if they have changed
Separate baselines for release versions and merge baseline if necessary
Visual Studio Integration
Can work through WAN

Thanks.
SW

Answer 1

Team Foundation Server is for everyone.

Answer 2

SVN will be great if you use blocking (usually the server does not know what clients do by default)

Perforce may be nice to see what makes it the default.

Both have VS integration, especially SVN.

Answer 3

SVN provided that you explicitly lock the files. This is not the default, but you can easily lock the file using SVN commands or through TortoiseSVN.

VisualSVN provides integration with Visual Studio.

Answer 4

If you need good Visual Studio integration, check out Microsoft Team System . You did not indicate whether you want to be free or commercial, or how critical integration with Visual Studio is.

Answer 5

git will do almost all of this. Not sure what to integrate it with Visual Studio. there may be a plugin for this. Causes:

• There is no central server. If you want one, you can have it, but you do not need it
• You can push and pull changes to others as you wish.
• Each of you can have your own branches and click only those that you need each other. Branching / merging is simple enough to work with a branch. Then push this task to the employee, if necessary.
• Unlike SVN, git only needs one directory at the top level of the directory structure.
• git stash rocks when you have changes in the current branch and you need to switch to another for a while. This is one of those things that you will not miss until you receive.
• Mergers are amazing.