Back to developer page.
Our Mercurial workflow
We use Mercurial, following the task-based workflow explained here. All significant development should be in response to an issue in the tracker, let's say issue1000. Then the usual development process involves two roles, "developer" and "reviewer" (usually Malte), and works as follows:
Developer creates a new branch issue1000 in their own repository, usually branching off the newest revision in default. Note the exact spelling of the branch. Being consistent here allows us to automate some of these steps in the future.
Developer resolves the issue in the branch. (Developer does not close the branch or push the changes to the master repository.)
- Developer sets the status of the issue to "reviewing".
- Reviewer pulls the issue1000 branch into their own repository.
- Reviewer reviews the code. If reviewer is not satisfied, go back to step 2.
- Reviewer closes the issue1000 branch.
- Reviewer merges the issue1000 branch into the default branch.
- Reviewer pushes the issue1000 branch and its merge into the master repository.
- Reviewer sets the status of the issue to "resolved".