I was asked to choose an open-source alternative to Clearcase-UCM, and I need an advice what would be the best match. Given below are some parameters I've collected:
- Half of the development teams use the Integration view, development view, rebase and delivery methodology. The rest just work straight on their integration stream with private views as if it was trunk.
- all the teams use baselines for labeling versions.
- They claim to be facing merging problems with Clearcase-UCM, so the alternative must have merging capabilities well designed.
- Zero maintenance - there is no VCS admin for the tool.
- Windows based development, so the tool must have a good win32 support.
- IDE integration (eclipse).
- Mac-OS support.
- nice to have: migration tool.
What tool will fit both working methods (neither of the groups is going to adopt the other method)? I have svn, mercurial, and git as alternative so far. will one of them fit? Are there any other choices?