Releases/Merge Checklist

Note: we are going to cherry pick from this page to build the canonical doc here: Release_Management/Merge_Documentation -- so this page is going to become obsolete/removed soon

This is an overall checklist for merging between channel repositories.

Plan

In advance:

• Get web content created and in place
• Write blog announcements to let people know about channel release content
• Try the merges locally and check any conflicts
• Deal with any conflicts / gather information to see if backouts need to stick

Execute

• Check the overall states of all the trees
  • We will pull mozilla-central even if it is red and then backout on mozilla-aurora
  • mozilla-aurora, mozilla-beta, and mozilla-release should be entirely green

Announce merging start

1. Tell the sheriff you are starting the merge
2. Make an announcement in #developers on irc.mozilla.org
   • This lets people know and gives an opportunity for quick feedback
3. Blog on the channels blog and post to dev-planning about the merge
   • This lets people know what is going on

mozilla-beta → mozilla-release

1. Do the merge from mozilla-beta to mozilla-release

• This should be performed prior to ship day or 'go' to build so that the appropriate mozilla-release changeset can be sent to the release-drivers list (see https://wiki.mozilla.org/Release:Release_Automation_on_Mercurial:Documentation#Sync_mozilla-beta_to_mozilla-release for example script)
• RelEng will sync l10n repos for release
• Ensure that the l10n control files are staying in their state, [browser|mobile]/locales/all-locales, shipped-locales, maemo-locales.
  • notably, on desktop, certain locales (eg: csb, mn, sw - but check for current status) should not be in shipped-locales even though they are being built in beta. Confirm with Axel if any new locales that were previously beta-only are now ready for release shipping.

# Starting with 10.0, ensure mobile/{android,xul}/config/mozconfigs/android/* have branding set to release on mozilla-release <- no longer needed

mozilla-aurora → mozilla-beta

1. Do the merge from mozilla-aurora to mozilla-beta (see mechanics)
2. Do the merge from l10n-aurora to l10n-beta
3. Make sure the version in mozilla-beta can be selected on addons.mozilla.org
4. Automatically bump all extensions on addons.mozilla.org from [mozilla-beta version]a1,2 to [mozilla-beta version]
5. Ensure that the l10n control files are staying in their state, [browser|mobile]/locales/all-locales, shipped-locales, maemo-locales.
6. Starting with 10.0, ensure mobile/{android,xul}/config/mozconfigs/android/* have branding set to beta on mozilla-beta

mozilla-central → mozilla-aurora

1. Do the merge from mozilla-central to mozilla-aurora (see mechanics)
2. No migration of l10n-central to l10n-aurora, if needed the localizers take care of that themselves
3. Make sure the version in mozilla-central can be selected on addons.mozilla.org
4. Make sure the version in mozilla-aurora can be selected on addons.mozilla.org
5. Automatically bump all extensions on addons.mozilla.org from [mozilla-aurora version]a1 to [mozilla-aurora version]a2
6. Ensure that the l10n control files are staying in their state, [browser|mobile]/locales/all-locales, shipped-locales, maemo-locales.
7. Ensure that the Add-on Compatibility Reporter maintainers update the addon for the new extensions.checkCompatibility.X.0a value and bump the add-on maxVersion
8. Ensure mobile/{android,xul}config/mozconfigs/android/* have branding set to aurora on mozilla-aurora
9. Ensure mobile/android/config/mozconfigs/android/l10n-nightly has an l10n-base of '..' (not '../../l10n-central')

Announce merging end

1. Tell the sheriff you are done with the merges
2. Make an announcement in #developers on irc.mozilla.org
   • This lets people know and gives an opportunity to find issues
3. Blog on the channels blog and post to dev-planning about the merge
   • This lets people know what is going on
4. Notify metrics team of the version changes on assorted channels