We use mercurial. For anything that is not a small fix we branch it off. It is extremely easy, and if that doesnt work you just kill that branch and you don't w

We use mercurial. For anything that is not a small fix we branch it off. It is extremely easy, and if that doesnt work you just kill that branch and you don't worry about anything. If you are a team of 12 then branching is definetely easier than having everyone constantly pushing into the live system