Merge Monkey is a branch management tool. It is used for many Telepathy-related branches. Merge Monkey
- produces diffs between branches for reviewers; usually between the head of a project and a branch containing bug fix or a new feature
- runs tests when branches are merged
- generates email announcements when branches are merged.
Merges to Telepathy branches are announced on the telepathy-commits mailing list.
Merge Monkey updates its diffs every five minutes.
Merge Monkey code is available.
Adding a branch to the monkey
If you are submitting patches to Telepathy projects, you may be asked to give a darcs branch to the monkey for review. There are two ways to go about this. One way is to give the URL of a branch to somebody who has access. They can mirror it on dhansak and add it to the monkey. The other way is to obtain an account on dhansak and add it to the monkey yourself:
Obtain shell access to dhansak; to do this, e-mail root <at> dhansak <dot> collabora.co.uk and include your name, preferred account name (no more than 8 characters), and an OpenSSH v2 public key (e.g. ~/.ssh/id_dsa.pub or ~/.ssh/id_rsa.pub), signed with your PGP key if you have one.
Make sure you are in the monkeys group.
ssh dhansak
cd ~monkey/branches
- naming your branch something containing your username is recommended, e.g. smcv uses branches like gabble-smcv-refactoring
darcs get <project head> <name of your branch>
vi ~monkey/branches.list
- log out
darcs push dhansak:~monkey/branches/<name of your branch>
(With time, this process should become easier as we have time to develop the monkey.)
Merging with the base branch
When your patches are reviewed and approved you can merge them with the base branch:
Make sure you are in the telepathy group on dhansak.
ssh dhansak
monkey-merge <path of your branch>
- log out