6/4 Merge Day Notes:

• sent 10 minute warning to #developers and dev-planning/dev-tree-management
• closed Aurora and Beta trees

Mozilla-Central version bump

cd ~/Mozilla/mozilla-central
hg pull
hg up
hg tag FIREFOX_AURORA_15_BASE

Version Bumps

browser/config/version.txt

-15.0a1
+16.0a1

config/milestone.txt

-15.0a1
+16.0a1

js/src/config/milestone.txt

-15.0a1
+16.0a1

mobile/android/confvars.sh

-MOZ_APP_VERSION=15.0a1
+MOZ_APP_VERSION=16.0a1

mobile/xul/confvars.sh

-MOZ_APP_VERSION=15.0a1
+MOZ_APP_VERSION=16.0a1

b2g/confvars.sh

-MOZ_APP_VERSION=15.0a1
+MOZ_APP_VERSION=16.0a1

xpcom/components/Module.h

-  static const unsigned int kVersion = 15;
+  static const unsigned int kVersion = 16;

Commit Your Changes

# checked the diffs to ensure nothing additional has been changed
hg diff 
hg commit -m "Merging in version bump NO BUG"
hg out
hg push

Announced to dev-planning and #developers that the m-c bump is completed

mozilla-aurora 14 to mozilla-beta uplift

Tag mozilla-aurora

cd ~/Mozilla/mozilla-aurora
hg tag -m "Tagging for mozilla-aurora->mozilla-beta uplift" FIREFOX_BETA_14_BASE
hg out
# review
hg push

Tagging and closing old beta

cd ~/mozilla/mozilla-beta
hg tag -m "Tagging end of BETA13 CLOSED TREE" FIREFOX_BETA_13_END
hg commit --close-branch -m 'closing old head CLOSED TREE'
hg out
hg push

Pull from Aurora into Beta

hg pull -u -r FIREFOX_BETA_14_BASE http://hg.mozilla.org/releases/mozilla-aurora

Version Bumps

browser/config/version.txt

-14.0a2
+14.0

config/milestone.txt

-14.0a2
+14.0

js/src/config/milestone.txt

-14.0a2
+14.0

mobile/android/confvars.sh

# DO NOT blindly s/a2// as it may affect other lines
-MOZ_APP_VERSION=14.0a2
+MOZ_APP_VERSION=14.0

mobile/xul/confvars.sh

# DO NOT blindly s/a2// as it may affect other lines
-MOZ_APP_VERSION=14.0a2
+MOZ_APP_VERSION=14.0

Commit Version Bumps

# check the diffs to ensure nothing additional has been changed
hg diff 
hg commit -m "Merging in version bump NO BUG CLOSED TREE"
hg out

Branding Changes

browser/confvars.sh

-MOZ_BRANDING_DIRECTORY=browser/branding/aurora
+MOZ_BRANDING_DIRECTORY=browser/branding/nightly
-ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-aurora
+ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release
-MAR_CHANNEL_ID=firefox-mozilla-aurora
+MAR_CHANNEL_ID=firefox-mozilla-beta

mobile/android/config/mozconfigs/android/debug

-ac_add_options --with-branding=mobile/android/branding/aurora
+ac_add_options --with-branding=mobile/android/branding/beta

mobile/android/config/mozconfigs/android/l10n-nightly

-ac_add_options --with-branding=mobile/android/branding/aurora
+ac_add_options --with-branding=mobile/android/branding/beta

mobile/android/config/mozconfigs/android/nightly

-ac_add_options --with-branding=mobile/android/branding/aurora
+ac_add_options --with-branding=mobile/android/branding/beta

mobile/xul/config/mozconfigs/android/debug

-ac_add_options --with-branding=mobile/xul/branding/aurora
+ac_add_options --with-branding=mobile/xul/branding/beta

mobile/xul/config/mozconfigs/android/nightly

-# Nightlies only since this has a cost in performance
-ac_add_options --enable-js-diagnostics
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/xul
-ac_add_options --with-branding=mobile/xul/branding/aurora
+ac_add_options --with-branding=mobile/xul/branding/beta

Commit branding changes

hg commit -m "Merging in branding changes NO BUG CLOSED TREE"
hg out

L10n data changes

• none

Used the clobberer to clobber all beta builds and then...

# ping Standard8 in #r-d to warn about push
hg push -f

mozilla-central 15 to mozilla-aurora uplift

Tagging and closing old aurora

cd ~/mozilla/mozilla-aurora
hg tag -m "Tagging for mozilla-central->mozilla-aurora uplift CLOSED TREE" FIREFOX_AURORA_14_END
hg commit --close-branch -m 'closing old head CLOSED TREE'
hg out
hg push

Pull from m-c into Aurora

hg pull -u -r FIREFOX_AURORA_15_BASE http://hg.mozilla.org/mozilla-central

Version Bumps

browser/config/version.txt

-15.0a1
+15.0a2

config/milestone.txt

-15.0a1
+15.0a2

js/src/config/milestone.txt

-15.0a1
+15.0a2

mobile/android/confvars.sh

# DO NOT blindly s/a1/a2 - make sure only this line
-MOZ_APP_VERSION=15.0a1
+MOZ_APP_VERSION=15.0a2

mobile/xul/confvars.sh

# DO NOT blindly s/a1/a2 - make sure only this line
-MOZ_APP_VERSION=15.0a1
+MOZ_APP_VERSION=15.0a2

Commit Version Bumps

# check the diffs to ensure nothing additional has been changed
hg diff 
hg commit -m "Merging in version bump NO BUG CLOSED TREE"
hg out

Branding Changes

browser/confvars.sh

-MOZ_BRANDING_DIRECTORY=browser/branding/nightly
+MOZ_BRANDING_DIRECTORY=browser/branding/aurora
-ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-central
+ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-aurora
-MAR_CHANNEL_ID=firefox-mozilla-central
+MAR_CHANNEL_ID=firefox-mozilla-aurora

mobile/android/config/mozconfigs/android/debug

-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/aurora

mobile/android/config/mozconfigs/android/l10n-nightly

-ac_add_options --with-l10n-base=../../l10n-central
+ac_add_options --with-l10n-base=..
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/aurora

mobile/android/config/mozconfigs/android/nightly

-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/aurora

mobile/xul/config/mozconfigs/android/debug

-ac_add_options --with-branding=mobile/xul/branding/nightly
+ac_add_options --with-branding=mobile/xul/branding/aurora

mobile/xul/config/mozconfigs/android/nightly

-ac_add_options --with-branding=mobile/xul/branding/nightly
+ac_add_options --with-branding=mobile/xul/branding/aurora

Commit branding changes

hg commit -m "Merging in branding changes NO BUG CLOSED TREE"
hg out

L10n data changes

Confirmed with Axel that aurora 15 needed to revert to 14 locale info

hg revert -r FIREFOX_AURORA_14_END browser/locales/*-locales
hg revert -r FIREFOX_AURORA_14_END mobile/android/locales/*-locales

Commit l10n changes

hg commit -m "Merging in l10n changes NO BUG CLOSED TREE"
hg out

Finishing up

Used the clobberer to clobber all aurora builds and then...

# pinged Standard8 (or TB driver) in #r-d to warn about push
hg push -f

Completion Checklist:

• Filed https://bugzilla.mozilla.org/show_bug.cgi?id=761289 to disable Aurora updates
• created this notes page
• backed out bug 733614
• re-opened trees
• sent notice to #developers and dev-planning that migration is complete and trees are re-opened (we will have to do a bit more landing/backing out before go to build)