Thunderbird/Release Driving/Rapid Release Activities/Merge Repositories

Setting up

Clone the drivertools repo

hg clone http://hg.mozilla.org/users/bugzilla_standard8.plus.com/drivertools/
cd drivertools/comm-merges

Make a Masters directory and pull the comm-* repositories into it. The masters repositories are a totally clean place for the merges. You may update existing repositories, but make sure they are clean first.

mkdir masters
cd masters
hg clone http://hg.mozilla.org/comm-release
hg clone http://hg.mozilla.org/releases/comm-aurora
hg clone http://hg.mozilla.org/releases/comm-beta
hg clone http://hg.mozilla.org/releases/comm-release
cd ..

Now run resetrepos.sh. This is a script which (re)sets up the working copies of the repositories, it avoids the need to pull from the network each time. It also sets the hg push urls to the ssh versions automatically.

./resetrepos.sh

Note: During the run the script will perform hg incoming and hg outgoing operations, check that these don't show any changesets

.