ReleaseEngineering:MergeDuty

Mergeduty

Mergeduty is responsible for making sure we're prepared for the next source code uplift.

Note that there are several uplifts involved:

beta->release
aurora->beta
central->aurora

For example, if mozilla-central currently contains Firefox 19, a bug may say "do xyz when FF19 merges to beta". Wait for that uplift to happen, then have the bug owner land the patch.

Be sure to have a clear understanding of which patches are landing for which uplift.

Duties include:

• Making sure bugs attached to merge-day-bug have owners and patches. Mergeduty can write the patches himself, or ask the owner of the bug to write the patch.

• Making sure sections in code marked with "MERGE DAY" have bugs and owners listed. Patches need to be attached to bugs. Mergeduty can write the patches himself, or ask that the owner of the code write the patch.

• The week before uplift, contact owners for all of the above to make a final decision of which bits should be uplifted or not.

• Coordinate landing of all the merge patches with owners. Coordinate deployment with buildduty.

• Create new hg bundles for affected repositories after the merges happen. (force build the bundle builders) (see bug 800280)
  • mozilla-aurora
  • mozilla-beta
  • mozilla-release
  • comm-aurora
  • comm-beta
  • comm-release

Next merge days

https://wiki.mozilla.org/RapidRelease/Calendar

The next merge is happening on Monday, January 7th: bug 813595 kmoir.

beta -> release merge would be happening on Friday, January 4th.

Mergeduty should start looking at patches/owners on Wednesday, January 2nd.

The previous merge on November 19th was tracked in bug 786550

The December 31, 2012 merge is being adjusted to the following week: January 7th. (more information)

Future Merge Duty Bugs

Move these under tracking bugs once they are created:

ESR 10 EOL

• bug 809311 - Drop leopard support when ESR 10 EOL (around Firefox 19)

ESR 17 EOL

• bug 809314 - Enable enable_pymake for ESR 17+