|
|
Line 144: |
Line 144: |
|
| |
|
| == Get all of the Repos == | | == Get all of the Repos == |
| | | mdkir ~/Mozilla/ |
| <pre><nowiki>
| | cd ~/Mozilla/ |
| $ mdkir ~/Mozilla/
| | hg clone http://hg.mozilla.org/mozilla-central/ mozilla-central |
| $ cd ~/Mozilla/
| | hg clone http://hg.mozilla.org/releases/mozilla-aurora/ mozilla-aurora |
| $ hg clone http://hg.mozilla.org/mozilla-central/ mozilla-central
| | hg clone http://hg.mozilla.org/releases/mozilla-beta/ mozilla-beta |
| $ hg clone http://hg.mozilla.org/releases/mozilla-aurora/ mozilla-aurora
| |
| $ hg clone http://hg.mozilla.org/releases/mozilla-beta/ mozilla-beta
| |
| </nowiki></pre>
| |
|
| |
|
| == Set each Repo up for Pushing == | | == Set each Repo up for Pushing == |
Line 174: |
Line 171: |
|
| |
|
| == Clone the Helper Script == | | == Clone the Helper Script == |
| * [https://gist.github.com/lsblakk/5568843 https://gist.github.com/lsblakk/5568843]
| | git clone https://gist.github.com/lsblakk/5568843 |
| | | ln -s 5568843/gistfile1.py merge_help.py |
| = mozilla-central tag/bump from {{CENTRAL_VERSION}} to {{NEXT_VERSION}} =
| |
| | |
| == Preparation and Tagging ==
| |
| * Send note to dev-planning and #developers announcing that the merge is about to start
| |
| | |
| $ cd ~/Mozilla/mozilla-central | |
| $ hg pull
| |
| $ hg up
| |
| $ hg tag FIREFOX_AURORA_{{CENTRAL_VERSION}}_BASE
| |
| | |
| == Version Bumps ==
| |
| === browser/config/version.txt ===
| |
| -{{CENTRAL_VERSION}}.0a1
| |
| +{{NEXT_VERSION}}.0a1
| |
| | |
| === config/milestone.txt ===
| |
| -{{CENTRAL_VERSION}}.0a1
| |
| +{{NEXT_VERSION}}.0a1
| |
|
| |
|
| === js/src/config/milestone.txt ===
| | * Open two terminal windows, be in the top dir of your cloned repos in both |
| -{{CENTRAL_VERSION}}.0a1
| | * In one of them run the helper script (in the other you can run the manual steps: tagging, pushing, etc): |
| +{{NEXT_VERSION}}.0a1 | | python merge_help.py |
|
| |
|
| === mobile/android/confvars.sh === | | === mozilla-central tag/bump from {{CENTRAL_VERSION}} to {{NEXT_VERSION}} === |
| -MOZ_APP_VERSION={{CENTRAL_VERSION}}.0a1 | | ==== Preparation and Tagging ==== |
| +MOZ_APP_VERSION={{NEXT_VERSION}}.0a1 | | * '''Send note to dev-planning and #developers announcing that the merge is about to start''' |
| | cd ~/Mozilla/mozilla-central |
| | hg pull |
| | hg up |
| | hg tag FIREFOX_AURORA_{{CENTRAL_VERSION}}_BASE |
|
| |
|
| === b2g/confvars.sh ===
| | * Script will do version bumps |
| -MOZ_APP_VERSION={{CENTRAL_VERSION}}.0a1
| |
| +MOZ_APP_VERSION={{NEXT_VERSION}}.0a1
| |
|
| |
|
| === xpcom/components/Module.h === | | ==== Verify & Commit Your Changes ==== |
| - static const unsigned int kVersion = {{CENTRAL_VERSION}};
| |
| + static const unsigned int kVersion = {{NEXT_VERSION}};
| |
| | |
| === services/sync/Makefile.in ===
| |
| -weave_version := 1.CURRENT_VERSION.X
| |
| +weave_version := 1.NEXT_VERSION.X
| |
| | |
| Please note that Sync isn't currently using Gecko's version. Instead, the version is a few ahead. Just increment the middle number in the string by 1.
| |
| | |
| Android Sync uses the milestone directly; see {{bug|761311}}.
| |
| | |
| == Commit Your Changes == | |
| # check the diffs to ensure nothing additional has been changed | | # check the diffs to ensure nothing additional has been changed |
| $ hg diff | | hg diff |
| $ hg commit -m "Merging in version bump NO BUG" | | hg commit -m "Merging in version bump NO BUG" |
| $ hg out | | hg out |
| $ hg push | | hg push |
|
| |
|
| or, if somebody lands a change on top of m-c in the meantime,
| | * '''Announce to dev-planning and #developers that the m-c bump is completed''' |
|
| |
|
| $ hg pull
| | === mozilla-aurora {{AURORA_VERSION}} to mozilla-beta uplift === |
| $ hg merge
| | ==== Tag mozilla-aurora ==== |
| # check the diffs to ensure nothing additional has been changed
| |
| $ hg diff
| |
| $ hg commit -m "Merging in version bump NO BUG"
| |
| $ hg out
| |
| $ hg push
| |
| | |
| * Announce to dev-planning and #developers that the m-c bump is completed
| |
| | |
| =mozilla-aurora {{AURORA_VERSION}} to mozilla-beta uplift= | |
| == Tag mozilla-aurora == | |
| cd ~/Mozilla/mozilla-aurora | | cd ~/Mozilla/mozilla-aurora |
| hg tag -m "Tagging for mozilla-aurora->mozilla-beta uplift CLOSED TREE DONTBUILD" FIREFOX_BETA_{{AURORA_VERSION}}_BASE | | hg tag -m "Tagging for mozilla-aurora->mozilla-beta uplift CLOSED TREE DONTBUILD" FIREFOX_BETA_{{AURORA_VERSION}}_BASE |
Line 246: |
Line 205: |
| hg push | | hg push |
|
| |
|
| == Tagging and closing old beta == | | ==== Tagging and closing old beta ==== |
| $ cd ~/mozilla/mozilla-beta | | cd ~/mozilla/mozilla-beta |
| $ hg tag -m "Tagging end of BETA{{BETA_VERSION}} CLOSED TREE" FIREFOX_BETA_{{BETA_VERSION}}_END | | hg tag -m "Tagging end of BETA{{BETA_VERSION}} CLOSED TREE" FIREFOX_BETA_{{BETA_VERSION}}_END |
| $ hg commit --close-branch -m 'closing old head CLOSED TREE' | | hg commit --close-branch -m 'closing old head CLOSED TREE' |
| $ hg out | | hg out |
| $ hg push | | hg push |
|
| |
|
| == Pull from Aurora into Beta == | | ==== Pull from Aurora into Beta ==== |
| $ hg pull -u -r FIREFOX_BETA_{{AURORA_VERSION}}_BASE http://hg.mozilla.org/releases/mozilla-aurora | | hg pull -u -r FIREFOX_BETA_{{AURORA_VERSION}}_BASE http://hg.mozilla.org/releases/mozilla-aurora |
|
| |
|
| == Version Bumps ==
| | * Script does version bumps |
| === browser/config/version.txt ===
| |
| -{{AURORA_VERSION}}.0a2
| |
| +{{AURORA_VERSION}}.0
| |
|
| |
|
| === config/milestone.txt === | | ==== Verify & Commit version bumps changes ==== |
| -{{AURORA_VERSION}}.0a2 | | hg commit -m "Merging in version bumps NO BUG CLOSED TREE ba=release" |
| +{{AURORA_VERSION}}.0 | | hg out |
|
| |
|
| === js/src/config/milestone.txt ===
| | * Script does branding changes |
| -{{AURORA_VERSION}}.0a2
| | ==== Verify & Commit branding changes ==== |
| +{{AURORA_VERSION}}.0
| | hg commit -m "Merging in branding changes NO BUG CLOSED TREE ba=release" |
| | | hg out |
| === mobile/android/confvars.sh === | |
| # DO NOT blindly s/a2// as it may affect other lines
| |
| -MOZ_APP_VERSION={{AURORA_VERSION}}.0a2
| |
| +MOZ_APP_VERSION={{AURORA_VERSION}}.0
| |
| | |
| === b2g/confvars.sh ===
| |
| -MOZ_APP_VERSION={{AURORA_VERSION}}.0a2
| |
| +MOZ_APP_VERSION={{AURORA_VERSION}}.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 ===
| |
| <pre><nowiki>
| |
|
| |
| -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
| |
|
| |
| </nowiki></pre>
| |
| | |
| === mobile/android/config/mozconfigs/android/debug ===
| |
| <pre><nowiki>
| |
| -ac_add_options --with-branding=mobile/android/branding/aurora
| |
| +ac_add_options --with-branding=mobile/android/branding/beta
| |
| </nowiki></pre>
| |
| | |
| === mobile/android/config/mozconfigs/android/l10n-nightly ===
| |
| <pre><nowiki>
| |
| -ac_add_options --with-branding=mobile/android/branding/aurora
| |
| +ac_add_options --with-branding=mobile/android/branding/beta
| |
| </nowiki></pre>
| |
| | |
| === mobile/android/config/mozconfigs/android/nightly ===
| |
| <pre><nowiki>
| |
| -ac_add_options --with-branding=mobile/android/branding/aurora
| |
| +ac_add_options --with-branding=mobile/android/branding/beta
| |
| </nowiki></pre>
| |
| | |
| === mobile/android/config/mozconfigs/android-armv6/debug ===
| |
| <pre><nowiki>
| |
| -ac_add_options --with-branding=mobile/android/branding/aurora
| |
| +ac_add_options --with-branding=mobile/android/branding/beta
| |
| </nowiki></pre>
| |
| | |
| === mobile/android/config/mozconfigs/android-armv6/l10n-nightly ===
| |
| <pre><nowiki>
| |
| -ac_add_options --with-branding=mobile/android/branding/aurora
| |
| +ac_add_options --with-branding=mobile/android/branding/beta
| |
| </nowiki></pre>
| |
| | |
| === mobile/android/config/mozconfigs/android-armv6/nightly ===
| |
| <pre><nowiki>
| |
| -ac_add_options --with-branding=mobile/android/branding/aurora
| |
| +ac_add_options --with-branding=mobile/android/branding/beta
| |
| </nowiki></pre>
| |
| | |
| === mobile/android/config/mozconfigs/android-x86/{debug,l10n-nightly,nightly} ===
| |
| <pre><nowiki>
| |
| -ac_add_options --with-branding=mobile/android/branding/aurora
| |
| +ac_add_options --with-branding=mobile/android/branding/beta
| |
| </nowiki></pre>
| |
| | |
| === mobile/android/config/mozconfigs/android-noion/{debug,l10n-nightly,nightly} ===
| |
| <pre><nowiki>
| |
| -ac_add_options --with-branding=mobile/android/branding/aurora
| |
| +ac_add_options --with-branding=mobile/android/branding/beta
| |
| </nowiki></pre>
| |
|
| |
|
| == Commit branding changes == | | ==== L10n data changes ==== |
| $ hg commit -m "Merging in branding changes NO BUG CLOSED TREE ba=release"
| | * l10n-drivers can file bugs post-merge to enable new locales, we'll revert mobile & desktop for now in order to not pull up locales which are not ready for beta |
| $ hg out
| |
| | |
| == L10n data changes == | |
| * confirm with l10n-drivers whether the uplift of locale files will need to be reverted or not (in order to not pull up locales which are not ready for beta) | |
| * watch mobile/android/locales/all-locales for changes between channels
| |
| Example for Aurora 12 -> Beta:
| |
| * MOBILE: no updated file changes desired (rollback is needed)
| |
| * DESKTOP: files on mozilla-aurora are in expected state for beta:
| |
| ** upgrade shipped-locales will occur as part of uplift
| |
| ** do not upgrade all-locales
| |
| hg revert -r FIREFOX_BETA_{{BETA_VERSION}}_END browser/locales/all-locales | | hg revert -r FIREFOX_BETA_{{BETA_VERSION}}_END browser/locales/all-locales |
| # if mobile | | hg revert -r FIREFOX_BETA_{{BETA_VERSION}}_END mobile/android/locales/*-locales |
| # hg revert -r FIREFOX_BETA_{{BETA_VERSION}}_END mobile/android/locales/*-locales
| |
|
| |
|
| === Commit l10n changes === | | ==== Commit l10n changes ==== |
| $ hg commit -m "Merging in l10n changes NO BUG CLOSED TREE ba=release" | | hg commit -m "Merging in l10n changes NO BUG CLOSED TREE ba=release" |
| $ hg out | | hg out |
|
| |
|
| == Analyzing for backouts == | | ==== Clobber & push ==== |
| See [[Release_Management/Merge_Documentation#Analyzing_for_backouts_2]]
| |
| | |
| == Finishing up == | |
| * Use the '''Regular Clobbers''' @ [https://build.mozilla.org/clobberer/ clobberer] to clobber all beta builders and then... | | * Use the '''Regular Clobbers''' @ [https://build.mozilla.org/clobberer/ clobberer] to clobber all beta builders and then... |
| # ping Standard8 in #r-d to warn about push | | # ping Standard8 in #r-d to warn about push |
| hg push -f | | hg push -f |
|
| |
|
| =mozilla-central {{CENTRAL_VERSION}} to mozilla-aurora uplift= | | ===mozilla-central {{CENTRAL_VERSION}} to mozilla-aurora uplift=== |
| == Don't forget to throttle the Aurora channel == | | ==== Don't forget to throttle the Aurora channel ==== |
| * Use [https://bugzilla.mozilla.org/enter_bug.cgi?alias=&assigned_to=nobody%40mozilla.org&attach_text=&blocked=&bug_file_loc=http%3A%2F%2F&bug_severity=normal&bug_status=NEW&cc=anthony.s.hughes%40gmail.com&cc=jbecerra%40mozilla.com&cc=hskupin%40gmail.com&cc=akeybl%40mozilla.com&cc=release-mgmt%40mozilla.com&cc=bbajaj%40mozilla.com&cf_blocking_b2g=---&cf_crash_signature=&comment=&component=Release%20Engineering%3A%20Automation%20%28General%29&contenttypeentry=&contenttypemethod=autodetect&contenttypeselection=text%2Fplain&data=&defined_groups=1&dependson=&description=&flag_type-4=X&flag_type-481=X&flag_type-607=X&flag_type-674=X&flag_type-720=X&flag_type-721=X&flag_type-737=X&flag_type-791=X&flag_type-800=X&flag_type-802=X&flag_type-803=X&flag_type-809=X&form_name=enter_bug&keywords=&maketemplate=Remember%20values%20as%20bookmarkable%20template&op_sys=All&priority=--&product=mozilla.org&qa_contact=catlee%40mozilla.com&rep_platform=All&requestee_type-4=&requestee_type-607=&requestee_type-753=&requestee_type-791=&requestee_type-800=&short_desc=Disable%20Aurora%20X%20daily%20updates%20until%20merge%20to%20mozilla-aurora%20has%20stabilized&status_whiteboard=&target_milestone=---&version=other this Bugzilla template] to file a bug requesting the disabling of Aurora updates (eg: bug 700794) - until we have sign off from QA | | * Use [https://bugzilla.mozilla.org/enter_bug.cgi?alias=&assigned_to=nobody%40mozilla.org&attach_text=&blocked=&bug_file_loc=http%3A%2F%2F&bug_severity=normal&bug_status=NEW&cc=anthony.s.hughes%40gmail.com&cc=jbecerra%40mozilla.com&cc=hskupin%40gmail.com&cc=akeybl%40mozilla.com&cc=release-mgmt%40mozilla.com&cc=bbajaj%40mozilla.com&cf_blocking_b2g=---&cf_crash_signature=&comment=&component=Release%20Engineering%3A%20Automation%20%28General%29&contenttypeentry=&contenttypemethod=autodetect&contenttypeselection=text%2Fplain&data=&defined_groups=1&dependson=&description=&flag_type-4=X&flag_type-481=X&flag_type-607=X&flag_type-674=X&flag_type-720=X&flag_type-721=X&flag_type-737=X&flag_type-791=X&flag_type-800=X&flag_type-802=X&flag_type-803=X&flag_type-809=X&form_name=enter_bug&keywords=&maketemplate=Remember%20values%20as%20bookmarkable%20template&op_sys=All&priority=--&product=mozilla.org&qa_contact=catlee%40mozilla.com&rep_platform=All&requestee_type-4=&requestee_type-607=&requestee_type-753=&requestee_type-791=&requestee_type-800=&short_desc=Disable%20Aurora%20X%20daily%20updates%20until%20merge%20to%20mozilla-aurora%20has%20stabilized&status_whiteboard=&target_milestone=---&version=other this Bugzilla template] to file a bug requesting the disabling of Aurora updates (eg: bug 700794) - until we have sign off from QA |
| ** '''Make sure QA is aware (an email to r-d is best)''' | | ** '''Make sure QA is aware (an email to r-d is best)''' |
|
| |
|
| == Tagging and closing old aurora == | | ==== Tagging and closing old aurora ==== |
| $ cd ~/mozilla/mozilla-aurora | | cd ~/mozilla/mozilla-aurora |
| $ hg tag -m "Tagging for mozilla-central->mozilla-aurora uplift CLOSED TREE" FIREFOX_AURORA_{{AURORA_VERSION}}_END | | hg tag -m "Tagging for mozilla-central->mozilla-aurora uplift CLOSED TREE" FIREFOX_AURORA_{{AURORA_VERSION}}_END |
| $ hg commit --close-branch -m 'closing old head CLOSED TREE DONTBUILD' | | hg commit --close-branch -m 'closing old head CLOSED TREE DONTBUILD' |
| $ hg out | | hg out |
| $ hg push | | hg push |
|
| |
|
| == Pull from m-c into Aurora == | | ==== Pull from m-c into Aurora ==== |
| $ hg pull -u -r FIREFOX_AURORA_{{CENTRAL_VERSION}}_BASE http://hg.mozilla.org/mozilla-central | | hg pull -u -r FIREFOX_AURORA_{{CENTRAL_VERSION}}_BASE http://hg.mozilla.org/mozilla-central |
|
| |
|
| == Version Bumps ==
| | * Script will do version bumps |
| === browser/config/version.txt ===
| | ==== Verify & Commit Version Bumps ==== |
| -{{CENTRAL_VERSION}}.0a1
| |
| +{{CENTRAL_VERSION}}.0a2
| |
| | |
| === config/milestone.txt === | |
| -{{CENTRAL_VERSION}}.0a1
| |
| +{{CENTRAL_VERSION}}.0a2
| |
| | |
| === js/src/config/milestone.txt ===
| |
| -{{CENTRAL_VERSION}}.0a1
| |
| +{{CENTRAL_VERSION}}.0a2
| |
| | |
| === b2g/confvars.sh ===
| |
| -MOZ_APP_VERSION={{CENTRAL_VERSION}}.0a1
| |
| +MOZ_APP_VERSION={{CENTRAL_VERSION}}.0a2
| |
| | |
| === mobile/android/confvars.sh ===
| |
| # DO NOT blindly s/a1/a2 - make sure only this line
| |
| -MOZ_APP_VERSION={{CENTRAL_VERSION}}.0a1
| |
| +MOZ_APP_VERSION={{CENTRAL_VERSION}}.0a2
| |
| | |
| == Commit Version Bumps == | |
| # check the diffs to ensure nothing additional has been changed | | # check the diffs to ensure nothing additional has been changed |
| $ hg diff | | hg diff |
| $ hg commit -m "Merging in version bump NO BUG CLOSED TREE" | | hg commit -m "Merging in version bump NO BUG CLOSED TREE" |
| $ hg out | | hg out |
|
| |
|
| == Branding Changes == | | * Script will do branding changes |
| === Custom changes for FF Nightly -> Aurora {{CENTRAL_VERSION}}===
| | ==== Verify & Commit branding changes ==== |
| * {{bug|841919}} - change in mozconfigs
| | hg commit -m "Merging in branding changes NO BUG CLOSED TREE ba=release" |
| === browser/confvars.sh ===
| | hg out |
| <pre><nowiki>
| |
| | |
| -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
| |
| </nowiki></pre>
| |
|
| |
|
| === mobile/android/config/mozconfigs/android/debug ===
| | * Script will disable profiling changes |
| -ac_add_options --with-branding=mobile/android/branding/nightly
| | ==== Verify & Commit profiling changes ==== |
| +ac_add_options --with-branding=mobile/android/branding/aurora
| | hg diff |
| | | hg commit -m "Disable profiling on Aurora NO BUG CLOSED TREE ba=release" |
| === mobile/android/config/mozconfigs/android/l10n-nightly ===
| | hg out |
| -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/android/config/mozconfigs/android-armv6/debug ===
| |
| -ac_add_options --with-branding=mobile/android/branding/nightly
| |
| +ac_add_options --with-branding=mobile/android/branding/aurora
| |
| | |
| === mobile/android/config/mozconfigs/android-armv6/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-armv6/nightly ===
| |
| -ac_add_options --with-branding=mobile/android/branding/nightly
| |
| +ac_add_options --with-branding=mobile/android/branding/aurora
| |
| | |
| === mobile/android/config/mozconfigs/android-x86/{debug,l10n-nightly,nightly} ===
| |
| -ac_add_options --with-branding=mobile/android/branding/nightly
| |
| +ac_add_options --with-branding=mobile/android/branding/aurora
| |
| | |
| === mobile/android/config/mozconfigs/android-noion/{debug,l10n-nightly,nightly} ===
| |
| -ac_add_options --with-branding=mobile/android/branding/nightly
| |
| +ac_add_options --with-branding=mobile/android/branding/aurora
| |
| | |
| == Commit branding changes == | |
| $ hg commit -m "Merging in branding changes NO BUG CLOSED TREE ba=release"
| |
| $ hg out
| |
| | |
| == Disable profiling ==
| |
| $ for file in `find browser/config/mozconfigs -type f -name nightly`; do sed -i -e '/enable-profiling/d' $file; done | |
| $ hg diff
| |
| $ hg commit -m "Disable profiling on Aurora NO BUG CLOSED TREE ba=release" | |
| $ hg out | |
| | |
| ==L10n data changes==
| |
| * confirm with l10n-drivers whether the uplift of locale files will need to be reverted or not (in order to not pull up locales which are not ready for beta)
| |
| ** On Aurora, it appears we should do this every time (but we do need to resolve things like {{bug|785652}} – adding zh-TW and zh-CN to fennec (FF19 specific). Beta needs confirmation each release.
| |
| * watch mobile/android/locales/all-locales for changes between channels
| |
|
| |
|
| | ==== L10n data changes ==== |
| | # revert to previous Aurora locales - l10n drivers can file post-merge bugs to add new locales |
| hg revert -r FIREFOX_AURORA_{{AURORA_VERSION}}_END browser/locales/*-locales | | hg revert -r FIREFOX_AURORA_{{AURORA_VERSION}}_END browser/locales/*-locales |
| hg revert -r FIREFOX_AURORA_{{AURORA_VERSION}}_END mobile/android/locales/*-locales | | hg revert -r FIREFOX_AURORA_{{AURORA_VERSION}}_END mobile/android/locales/*-locales |
|
| |
|
| === Commit l10n changes=== | | ==== Verify & Commit l10n changes==== |
| $ hg commit -m "Merging in l10n changes NO BUG CLOSED TREE ba=release" | | $ hg commit -m "Merging in l10n changes NO BUG CLOSED TREE ba=release" |
| $ hg out | | $ hg out |
|
| |
|
| == Analyzing for backouts == | | ==== Clobber & push ==== |
| Use [https://bugzilla.mozilla.org/page.cgi?id=release_tracking_report.html this report] to find all approvals for Aurora/Beta over the past cycle, then plop that buglist into a query like [https://bugzilla.mozilla.org/buglist.cgi?bug_id=702319%2C735713%2C728623%2C735312%2C735790%2C712109%2C735126%2C725294%2C730196%2C734784%2C735517%2C735481%2C711157%2C736512%2C736012%2C736495%2C733282%2C696533%2C704977%2C726393%2C731034%2C731267%2C732104%2C733196%2C736099%2C647914%2C721719%2C732363%2C734530%2C735141%2C735313%2C735579%2C726272%2C735987%2C736845%2C736846%2C728790%2C736804%2C736444%2C733979%2C736058%2C712836%2C736542%2C735564%2C735768%2C735660%2C723484%2C708149%2C737830%2C737784%2C727449%2C729111%2C731654%2C736251%2C737445%2C736389%2C731546%2C720300%2C738695%2C735805%2C735666%2C738334%2C738392%2C737307%2C737875%2C709402%2C715792%2C731024%2C738516%2C736519%2C705911%2C711418%2C726734%2C715319%2C735177%2C725167%2C725428%2C726001%2C729532%2C738859%2C732585%2C736456%2C737631%2C731613%2C738769%2C706784%2C737182%2C717175%2C736589%2C733793%2C737758%2C704406%2C708187%2C739418%2C740306%2C482057%2C703774%2C717180%2C720679%2C738043%2C739004%2C739093%2C740235%2C740581%2C739925%2C735943%2C731795%2C736278%2C738804%2C737433%2C731896%2C708825%2C738985%2C736915%2C741670%2C721731%2C730273%2C735636%2C737867%2C737896%2C738961%2C740094%2C740118%2C656225%2C739048%2C738349%2C741135%2C739793%2C724352%2C742174%2C735749%2C637101%2C740769%2C742120%2C732951%2C734019%2C743475%2C732343%2C737780%2C737966%2C740606%2C742645%2C735073%2C724978%2C736609%2C738919%2C313700%2C740595%2C737384%2C744480%2C745555%2C714631%2C736028%2C732976%2C738812%2C741506%2C744152%2C744788%2C745379%2C406541%2C742414%2C731837%2C735151%2C737457%2C744888%2C745494%2C704124%2C732382%2C732233%2C736476%2C739697%2C743178%2C745699%2C745712%2C745744;type1-0-0=nowordssubstr;negate0=1;bug_id_type=anyexact;type0-1-0=substring;list_id=2951029;field0-1-0=resolution;field0-0-0=target_milestone;query_format=advanced;value0-1-0=FIX;value1-0-0=fixed%20verified%20unaffected;type0-0-0=substring;value0-0-0=14;field1-0-0=cf_status_firefox14 this] to find a shortened list of things we may need to take on the next Aurora/Beta version
| |
| | |
| ===Known Backouts for Version===
| |
| For Aurora 19,
| |
| * 803630 - Remove the visible UI setting for enabling reflow on zoom (Fx for Android :mfinkle)
| |
| | |
| For Beta 19 (and probably 20)
| |
| * 817775 - Marketplace promo is active on beta on about:home, but it shouldn't be (Fx for Android :mfinkle)
| |
| | |
| For 20?
| |
| * 791244 – Undo the pref for the temporary hangserver for beta channels until Socorro is awesome
| |
| | |
| For 21 (Feb 19th):
| |
| * 840750 – Backout bug 818340 from Aurora after 2/19/2013 merge day
| |
| | |
| For 22:
| |
| * 847898 - Back out/disable bug 726335 from beta once FF22 is on beta (Fx for Android :kats)
| |
| | |
| == Finishing up ==
| |
| * Use the '''Regular Clobbers''' @ [https://build.mozilla.org/clobberer/ clobberer] to clobber all aurora builders and then... | | * Use the '''Regular Clobbers''' @ [https://build.mozilla.org/clobberer/ clobberer] to clobber all aurora builders and then... |
| # ping Standard8 (or TB driver) in #r-d to warn about push | | # ping Standard8 (or TB driver) in #r-d to warn about push |