== Branch Information ==
See also [[B2G/Roadmap]].
=== v2.0 ===
<b>Open for approved patches and security fixes.</b>
==== Source Repositories ====
* Gecko: [https://hg.mozilla.org/releases/mozilla-b2g32_v2_0 mozilla-b2g32_v2_0] ("b2g32")
* Gaia: [https://github.com/mozilla-b2g/gaia/tree/v2.0 v2.0 branch] ("v2.0")
* B2G Manifests: [https://github.com/mozilla-b2g/b2g-manifest/tree/v1.4 2.0] ("v2.0")
==== Landing Procedure ====
* sec-high and sec-critical patches have automatic approval to land if the fix has landed on all affected Firefox branches. All others must have approval-mozilla-b2g32+ / approval-gaia-v2.0+ to land (<b>including bugs marked as blocking-b2g:2.0+</b>)
* Follow normal landing practices for Trunk/Master.
* Unless the bug only affects that branch, the bug must be Resolved/Fixed before uplifting.
* Add a=2.0+ for security bugs or a=<whoever approved> to the end of the commit message and uplift to:
** [https://github.com/mozilla-b2g/gaia/tree/v2.0 v2.0]/[https://hg.mozilla.org/releases/mozilla-b2g32_v2_0 b2g32] (setting status-b2g-v2.0:fixed)
==== Blocker/Approval Queries ====
* All blocking-b2g:2.0? - http://mzl.la/1ew8ARn
* Open blocking-b2g:2.0+ - http://mzl.la/1iWVZ5L
* approval-gaia-v2.0? - http://mzl.la/1hBN2Ez
* approval-mozilla-b2g32? - http://mzl.la/1mAu7Gf
==== Latest/Final tagged ====
Tue, 21 Jul 2015 09:42:58 -0700 B2G_2_0_END [https://hg.mozilla.org/releases/mozilla-b2g32_v2_0/rev/2e6f1d4deff9 changeset] | [https://hg.mozilla.org/releases/mozilla-b2g32_v2_0/log/2e6f1d4deff9 changelog] | [https://hg.mozilla.org/releases/mozilla-b2g32_v2_0/file/2e6f1d4deff9 files]
=== v2.0M ===
<b>Open for any feature work and bug fixes.</b>
==== Source Repositories ====
* Gecko: [http://hg.mozilla.org/releases/mozilla-b2g32_v2_0m/ mozilla-b2g32_v2_0m] ("b2g32_v2_0m")
* Gaia: [https://github.com/mozilla-b2g/gaia/tree/v2.0m branch] ("v2.0m")
==== Landing Procedure ====
* Patches must have blocking-b2g:2.0M+ to land.
* Follow normal landing practices for Trunk/Master unless the but only affects the v2.0M branch.
* Unless the bug only affects that branch, the bug must be Resolved/Fixed on master before uplifting.
* Add a=2.0M+ to the end of the commit message and uplift to:
** [https://github.com/mozilla-b2g/gaia/tree/v2.0m v2.0m]/[https://hg.mozilla.org/releases/mozilla-b2g32_v2_0m b2g32_v2_0m] (setting status-b2g-v2.0M:fixed)
* Bugs that also affect v2.1 (status-b2g-v2.1:affected) or v2.2 (status-b2g-v2.2:affected) will be handled on a case-by-case basis upon approval from release manager for uplift. Due to the specialized nature of this branch, <b>2.0M+ blocking status does not grant automatic approval</b> to uplift to v2.1 or v2.2. Patches must go through the regular approval process as detailed below for v2.1 or v2.2 consideration.
* The v2.0 repos (b2g32 / v2.0) are regularly merged by the device team to the v2.0M branches. <b>Patches with v2.0 approval should not be double-landed on 2.0 and 2.0M branches.</b>
==== Blocker Queries ====
* All open blocking-b2g:2.0M? - http://mzl.la/1AFlRfv
* All open blocking-b2g:2.0M+ - http://mzl.la/1AFm2HW
==== latest/final tagged ====
Wed, 22 Jul 2015 23:42:20 -0400 B2G_2_0M_END [https://hg.mozilla.org/releases/mozilla-b2g32_v2_0m/rev/4e82c466cac4 changeset] | [https://hg.mozilla.org/releases/mozilla-b2g32_v2_0m/log/4e82c466cac4 changelog] | [https://hg.mozilla.org/releases/mozilla-b2g32_v2_0m/file/4e82c466cac4 files]
=== v2.1 ===
<b>Open for approved patches and security fixes.</b>
==== Source Repositories ====
* Gecko: [http://hg.mozilla.org/releases/mozilla-b2g34_v2_1/ mozilla-b2g34_v2_1] ("mozilla-b2g34_v2_1")
* Gaia: [https://github.com/mozilla-b2g/gaia/tree/v2.1 v2.1 branch] ("v2.1")
* B2G Manifests: [https://github.com/mozilla-b2g/b2g-manifest/tree/v2.1 2.1] ("v2.1")
==== Landing Procedure ====
* sec-high and sec-critical patches have automatic approval to land if the fix has landed on all affected Firefox branches. All others must have approval‑mozilla‑b2g34+ / approval-gaia-v2.1+ to land (<b>including bugs marked as blocking-b2g:2.1+</b>)
** If you have to land any non-blocking change, please make sure to validate your request with a strong reason to consider given the CC milestone and the release timeline. We request you to use approval-gaia-v2.1? for gaia and approval‑mozilla‑b2g34? for gecko to consider request uplift as necessary.<b> No guarantees on approval for non-blocking bugs, it may be granted depending on the risk/reward and how far we are in the release timeline </b>
* Follow normal landing practices for Trunk/Master.
* Unless the bug only affects that branch, the bug must be Resolved/Fixed before uplifting.
* Add a=2.1+ for security bugs or a=<whoever approved> to the end of the commit message and uplift to:
** [https://github.com/mozilla-b2g/gaia/tree/v2.1 v2.1]/[http://hg.mozilla.org/releases/mozilla-b2g34_v2_1/ mozilla-b2g34_v2_1] (setting status-b2g-v2.1:fixed)
==== Blocker/Approval Queries ====
* All blocking-b2g:2.1? - http://mzl.la/1pXgkjt
* Open blocking-b2g:2.1+ - http://mzl.la/1pXgp6X
* approval-gaia-v2.1? - http://mzl.la/1A21pFx
* approval‑mozilla‑b2g34? - http://mzl.la/1yvEfe4
==== Latest/Final tagged ====
Thu, 23 Jul 2015 10:35:28 -0400 B2G_2_1_END [https://hg.mozilla.org/releases/mozilla-b2g34_v2_1/rev/41e10c6740be changeset] | [https://hg.mozilla.org/releases/mozilla-b2g34_v2_1/log/41e10c6740be changelog] | [https://hg.mozilla.org/releases/mozilla-b2g34_v2_1/file/41e10c6740be files]
=== v2.1S ===
== Automatic Branch Uplifts ==
=== v2.0 ===
* Ready to uplift to mozilla-b2g32_v2_0 (Gecko)
** <strike>[https://bugzilla.mozilla.org/buglist.cgi?order=cf_last_resolved&chfield=resolution&chfieldfrom=2014-06-09&bug_status=RESOLVED&bug_status=VERIFIED&resolution=FIXED&field0-0-0=cf_blocking_b2g&type0-0-0=anywordssubstr&value0-0-0=2.0%2B&field0-1-0=component&type0-1-0=nowords&value0-1-0=Gaia&field0-2-0=cf_status_b2g_2_0&type0-2-0=nowordssubstr&value0-2-0=fixed%20verified%20unaffected%20wontfix%20disabled&field0-3-0=status_whiteboard&type0-3-0=nowordssubstr&value0-3-0=NO_UPLIFT%20NPOTB%20POVB blocking-b2g:2.0+ (without NO_UPLIFT, NPOTB, or POVB)]</strike> - <b>ALL BLOCKERS MUST HAVE APPROVAL TO LAND</b>
** [https://bugzilla.mozilla.org/buglist.cgi?order=cf_last_resolved;field0-0-0=flagtypes.name;type0-0-0=anywordssubstr;value0-0-0=approval-mozilla-b2g32%2B;field0-1-0=cf_status_b2g_2_0;type0-1-0=nowordssubstr;value0-1-0=fixed%20verified%20unaffected%20wontfix%20disabled approval-mozilla-b2g32+]
* Ready to uplift to v2.0 (Gaia)
** <strike>[https://bugzilla.mozilla.org/buglist.cgi?f10=CP&o5=nowordssubstr&f1=OP&f8=component&f0=OP&v11=NO_UPLIFT%20NPOTB%20POVB&o11=nowordssubstr&resolution=FIXED&o2=anywordssubstr&f9=CP&j7=OR&f4=OP&v5=fixed%20verified%20unaffected%20wontfix%20disabled&chfieldto=Now&query_format=advanced&chfield=resolution&j1=OR&f3=CP&chfieldfrom=2014-06-09&f2=cf_blocking_b2g&chfieldvalue=FIXED&f11=status_whiteboard&bug_status=RESOLVED&bug_status=VERIFIED&j4=OR&f5=cf_status_b2g_2_0&v8=Gaia&f6=CP&v2=2.0%2B&f7=OP&o8=substring blocking-b2g:2.0+ (without NO_UPLIFT, NPOTB, or POVB)]</strike> - <b>ALL BLOCKERS MUST HAVE APPROVAL TO LAND</b>
** [https://bugzilla.mozilla.org/buglist.cgi?order=cf_last_resolved;field0-0-0=flagtypes.name;type0-0-0=anywordssubstr;value0-0-0=approval-gaia-v2.0%2B;field0-1-0=cf_status_b2g_2_0;type0-1-0=nowordssubstr;value0-1-0=fixed%20verified%20unaffected%20wontfix%20disabled approval-gaia-v2.0+]
* [https://bugzilla.mozilla.org/buglist.cgi?order=cf_last_resolved&resolution=FIXED&f1=bug_group&o1=substring&v1=sec&f2=cf_status_b2g_2_0&o2=equals&v2=affected Security bugs affecting v2.0]
=== v2.1 ===
* Ready to uplift to mozilla-b2g34 (Gecko)
** <strike>[https://bugzilla.mozilla.org/buglist.cgi?order=cf_last_resolved&chfield=resolution&chfieldfrom=2014-09-01&bug_status=RESOLVED&bug_status=VERIFIED&resolution=FIXED&field0-0-0=cf_blocking_b2g&type0-0-0=anywordssubstr&value0-0-0=2.0%2B%202.1%2B&field0-1-0=component&type0-1-0=nowords&value0-1-0=Gaia&field0-2-0=cf_status_b2g_2_1&type0-2-0=nowordssubstr&value0-2-0=fixed%20verified%20unaffected%20wontfix%20disabled&field0-3-0=status_whiteboard&type0-3-0=nowordssubstr&value0-3-0=NO_UPLIFT%20NPOTB%20POVB blocking-b2g:2.0+/2.1+ (without NO_UPLIFT, NPOTB, or POVB)]</strike> - <b>ALL BLOCKERS MUST HAVE APPROVAL TO LAND</b>
** [https://bugzilla.mozilla.org/buglist.cgi?cf_last_resolved;field0-0-0=flagtypes.name;type0-0-0=anywordssubstr;value0-0-0=approval-mozilla-b2g34%2B;field0-1-0=cf_status_b2g_2_1;type0-1-0=nowordssubstr;value0-1-0=fixed%20verified%20unaffected%20wontfix%20disabled approval-mozilla-b2g34+]
* Ready to uplift to v2.1 (Gaia)
** <strike>[https://bugzilla.mozilla.org/buglist.cgi?f10=CP&o5=nowordssubstr&f1=OP&f8=component&f0=OP&v11=NO_UPLIFT%20NPOTB%20POVB&o11=nowordssubstr&resolution=FIXED&o2=anywordssubstr&f9=CP&j7=OR&f4=OP&v5=fixed%20verified%20unaffected%20wontfix%20disabled&chfieldto=Now&query_format=advanced&chfield=resolution&j1=OR&f3=CP&chfieldfrom=2014-09-01&f2=cf_blocking_b2g&chfieldvalue=FIXED&f11=status_whiteboard&bug_status=RESOLVED&bug_status=VERIFIED&j4=OR&f5=cf_status_b2g_2_1&v8=Gaia&f6=CP&v2=2.0%2B%202.1%2B&f7=OP&o8=substring blocking-b2g:2.0+/2.1+ (without NO_UPLIFT, NPOTB, or POVB)]</strike> - <b>ALL BLOCKERS MUST HAVE APPROVAL TO LAND</b>
** [https://bugzilla.mozilla.org/buglist.cgi?cf_last_resolved;field0-0-0=flagtypes.name;type0-0-0=anywordssubstr;value0-0-0=approval-gaia-v2.1%2B;field0-1-0=cf_status_b2g_2_1;type0-1-0=nowordssubstr;value0-1-0=fixed%20verified%20unaffected%20wontfix%20disabled approval-gaia-v2.1+]
* [https://bugzilla.mozilla.org/buglist.cgi?order=cf_last_resolved&resolution=FIXED&f1=bug_group&o1=substring&v1=sec&f2=cf_status_b2g_2_1&o2=equals&v2=affected Security bugs affecting v2.1]
=== v2.2 ===
* Ready to uplift to mozilla-b2g37 (Gecko)
== Sanity Checks ==
* FIXED 2.1+ blockers not 2.1:fixed - http://mzl.la/1kMEXN8
* FIXED 2.1+ blockers not 2.2:fixed - http://mzl.la/1wap4mS
* FIXED 2.2+ blockers not 2.2:fixed - http://mzl.la/1o0ZlaX
