Subversion

In the company we are using a source control server called Subversion or SVN for short. Every time we want to start to work, we have to update the local project from the SVN server. And every time when we have made some progress and passed all tests, we update again to ensure there's no conflict by running all tests again, then we commit it to the SVN server. All tests must be passed, all conflicts must be resolved before we could commit what we have done to the server.

There's a distinction between trunk and branch on the server. As has just said, all tests must be passed before committing, or the server will reject it, which referred to committing to the trunk. But when we want to make a radical change, like change the directory structures of the project, as what Philip has been doing these days, we can't pass all the tests in a single day even a couple of days, and we want to commit what we have done to the server so that our work may not be lost, we create a branch, and commit it to the branch. When we have done the change and pass all the tests, we can merge it to the trunk, of course, all conflicts should be resolved.