Thunderbird/Release Driving/Rapid Release Activities/Merge Repositories: Difference between revisions

Thunderbird/Release Driving/Rapid Release Activities/Merge Repositories (view source)

Revision as of 18:50, 30 March 2015

907 bytes added , 30 March 2015

wip major update to latest

Standard8

canmove, Confirmed users, Bureaucrats and Sysops emeriti

3,627

edits

@@ Line 1: / Line 1: @@
 == Setting up ==
+You'll need access to:
+* Mercurial (level 3)
+* [https://treestatus.mozilla.org/ treestatus] (one of the existing Thunderbird folks should be able to ask the Sheriffs to give you access).
 Clone the drivertools repo
@@ Line 6: / Line 11: @@
   cd drivertools/comm-merges
-Run reset????repos.sh. This is a script which sets up the working copies of the repositories, it downloads the bundles, extracts and updates them and then sets the hg push urls to the ssh versions automatically.
+== Merges Overview ==
+Merges should be done in the order:
+* comm-beta -> comm-release (used by SeaMonkey)
+* comm-aurora -> comm-beta
+* comm-central -> comm-aurora
+=== When merges happen ===
+The comm-beta -> comm-release merge is typically done a few days before the main merges. Normally the SeaMonkey folks determine when. At the latest it is done on Merge day.
+The other two merges happen on Merge Day. This can be determined by looking at the [[RapidRelease/Calendar|release calendar]].
-If doing a comm-beta -> comm-release merge, run
+=== How to close the Trees ===
- ./resetreleaserepos.sh
+Use [https://treestatus.mozilla.org/ treestatus] for closing trees. Set the "state" to CLOSED with a reason of "for merges" with the "Planned closure" tick box selected.
-If doing a comm-central -> comm-aurora or comm-aurora to comm-beta, run
+For each merge ensure the relevant trees are closed, i.e. for comm-beta -> comm-release, ensure:
- ./resetmainrepos.sh
+** comm-beta-thunderbird
+** comm-beta-seamonkey
+** comm-release-thunderbird
+** comm-release-seamonkey
-== Doing the merges ==
+=== Reopening the Trees ===
-=== Close the Trees ===
+Reopening trees is only done when:
-You definitely want to close Thunderbird-Aurora, Thunderbird-Beta, SeaMonkeyAurora and SeaMonkeyBeta.
+* For central: after the merges are completed and the version numbers have been bumped.
+* For aurora, beta and release: after the merges are completed *and* the builds have been completed.
-You may also wish to close Thunderbird-Trunk and SeaMonkeyTrunk, Thunderbird-Release and SeaMonkeyRelease
+When re-opening the tree, ensure you set it to the state that it was previously (generally "approval-required" for aurora/beta and "open" for central). There's a history on the page where you can check.
 === comm-aurora -> comm-beta merge ===