Hi! After 3-4 days of heavy testing of GIT and Mercurial, I decided to switch to Mercurial (http://www.selenic.com/mercurial/). This decision is based on the following facts: * Merging of branches. The GIT-way is to commit often. While I think we should keep it like we did in the past: every commit should build and work. This makes searching for bugs much easier (hint: bisect). Merging branches in GIT normally only works with a clean target (I know it can be done with GIT too, e.g. stash, but it's very complicated), while in Mercurial you simply can pull a branch into your working directory. * Mercurial is a bit simpler. GIT is very powerful. And I think, as most developers are students who probably never used a SCM, it should be easy and straight-forward to use our new SCM. Although you can do most (maybe all) stuff with Mercurial too what you can do with GIT (e.g. git reset vs. hg rollback, hg strip, hg clone -r). * Local branches. I'm not sure people will actually use local branches as switching branches in the repository directory means that your project always re-configures and recompiles. Anyway, Mercurial does support in-repository branches, although it does not support to delete branches! For local branches you want to delete after you worked on them, please use hg clone and work there or the local-branches extension from Mercurial (http://www.selenic.com/mercurial/wiki/index.cgi/LocalBranches). I haven't set up an anonymous access yet, but I try to do this ASAP. In the meantime only developers with SSH access to one of our institute machines can access the repository: ssh://mips.complang.tuwien.ac.at//ahome/cacao/hg/cacao Have fun! - twisti
