We need a configuration tool that supports the following functions:
1. Branching - the ability to keep many similar sets of files (e.g a release version and a developing version, or versions for defferent clients).
2. Merging - the tool must be able to merge file changes created concurrently by different users.
3. File history - the history of each file (file changes along development, author, changed by whom and so on) must be available.
of course, all the standard features must be supported (user access, label management, etc).
Our team includes 5 developers but we intend to increase it up to 7 by the end of the year.
We are currently using SOurceSafe and we're not pleased.