Tree Rules: Difference between revisions
Jump to navigation
Jump to search
m (remove out-of-date versions) |
(clean up redundant stuff in headings; other updates) |
||
| Line 1: | Line 1: | ||
For comm-central tree rules, [[Tree_Rules/comm-central|see this page]]. | For comm-central tree rules, [[Tree_Rules/comm-central|see this page]]. | ||
== [http://tbpl.mozilla.org/ mozilla-central] | Not sure which Firefox version is on which branch today? See [[RapidRelease/Calendar]]. | ||
== [http://tbpl.mozilla.org/ mozilla-central] (Nightly channel) == | |||
* '''All changes''' must meet the [https://developer.mozilla.org/En/Developer_Guide/Committing_Rules_and_Responsibilities general checkin rules]. You must check the tree before pushing, and watch the tree for failures after pushing. | * '''All changes''' must meet the [https://developer.mozilla.org/En/Developer_Guide/Committing_Rules_and_Responsibilities general checkin rules]. You must check the tree before pushing, and watch the tree for failures after pushing. | ||
* Please ask in #developers on [[IRC]] if you have questions. | * Please ask in #developers on [[IRC]] if you have questions. | ||
== [https://tbpl.mozilla.org/?tree=Mozilla-Inbound mozilla-inbound] | == [https://tbpl.mozilla.org/?tree=Mozilla-Inbound mozilla-inbound] == | ||
* '''All changes''' must meet the [https://developer.mozilla.org/En/Developer_Guide/Committing_Rules_and_Responsibilities general checkin rules], except you do not need to watch the tree after pushing. | * '''All changes''' must meet the [https://developer.mozilla.org/En/Developer_Guide/Committing_Rules_and_Responsibilities general checkin rules], except you do not need to watch the tree after pushing. | ||
| Line 13: | Line 15: | ||
* Ask in #developers on [[IRC]] if you have any questions. | * Ask in #developers on [[IRC]] if you have any questions. | ||
== [https://tbpl.mozilla.org/?tree=Mozilla-Aurora mozilla-aurora] | == [https://tbpl.mozilla.org/?tree=Mozilla-Aurora mozilla-aurora] == | ||
'''<font color="orange">APPROVAL REQUIRED</font>''' | '''<font color="orange">APPROVAL REQUIRED</font>''' | ||
| Line 23: | Line 25: | ||
** have landed in mozilla-central to bake on the nightly channel for a few days. | ** have landed in mozilla-central to bake on the nightly channel for a few days. | ||
** have a comment in Bugzilla assessing performance impact, risk, and reasons the patch is needed on aurora. | ** have a comment in Bugzilla assessing performance impact, risk, and reasons the patch is needed on aurora. | ||
* Approval requests will be processed by [[Releases/Drivers|release drivers]] in the weekly [[Firefox/ | * Approval requests will be processed by [[Releases/Drivers|release drivers]] in the weekly [[Firefox/Channels]] meetings. | ||
* Set the appropriate "status-firefoxN" flag to "fixed" after landing a fix on the Aurora branch. | |||
== [https://tbpl.mozilla.org/?tree=Mozilla-Beta mozilla-beta] | == [https://tbpl.mozilla.org/?tree=Mozilla-Beta mozilla-beta] == | ||
'''<font color="orange">APPROVAL REQUIRED</font>''' | '''<font color="orange">APPROVAL REQUIRED</font>''' | ||
| Line 36: | Line 39: | ||
** have a comment in Bugzilla assessing performance impact, risk, and reasons the patch is needed on beta. | ** have a comment in Bugzilla assessing performance impact, risk, and reasons the patch is needed on beta. | ||
** not change binary interfaces or otherwise break add-on compatibility. | ** not change binary interfaces or otherwise break add-on compatibility. | ||
* Approval requests will be processed by [[Releases/Drivers|release drivers]] in the weekly [[Firefox/ | * Approval requests will be processed by [[Releases/Drivers|release drivers]] in the weekly [[Firefox/Channels]] meetings. | ||
* Set the appropriate "status-firefoxN" flag to "fixed" after landing a fix on the Beta branch. | |||
== [https://tbpl.mozilla.org/?tree=Mozilla-Release mozilla-release] - Release == | == [https://tbpl.mozilla.org/?tree=Mozilla-Release mozilla-release] - Release channel == | ||
'''<font color="orange">APPROVAL REQUIRED</font>''' | '''<font color="orange">APPROVAL REQUIRED</font>''' | ||
| Line 46: | Line 50: | ||
* Changes to the release branch are limited to urgent "chemspills" like zero-day security vulnerabilities and other unplanned emergencies. Any changes to this branch will be directly overseen by [[Releases/Drivers|release drivers]]. | * Changes to the release branch are limited to urgent "chemspills" like zero-day security vulnerabilities and other unplanned emergencies. Any changes to this branch will be directly overseen by [[Releases/Drivers|release drivers]]. | ||
== [https://tbpl.mozilla.org/?tree=Firefox3.6 mozilla-1.9.2] | == [https://tbpl.mozilla.org/?tree=Firefox3.6 mozilla-1.9.2] (Firefox 3.6.x) == | ||
'''<font color="orange">APPROVAL REQUIRED</font>''' | '''<font color="orange">APPROVAL REQUIRED</font>''' | ||
| Line 53: | Line 57: | ||
* patches must have '''approval1.9.2.x+''' (for whatever value of x is relevant). | * patches must have '''approval1.9.2.x+''' (for whatever value of x is relevant). | ||
* Set the "status1.9.2" flag to the relevant "fixed .x" value when the patch has been checked into the branch | * Set the "status1.9.2" flag to the relevant "fixed .x" value when the patch has been checked into the branch | ||
* Patches nominated for approval1.9.2.x should: | |||
Patches nominated for approval1.9.2.x should: | ** have tests, or a strong statement of what can be done in the absence of tests | ||
* have tests, or a strong statement of what can be done in the absence of tests | ** have landed on trunk and baked for a few days (at least) | ||
* have landed on trunk and baked for a few days (at least) | ** have an assessment of performance impact | ||
* have an assessment of performance impact | ** have an assessment of risk | ||
* have an assessment of risk | |||
Please see #developers or today's Sheriff if you have questions. | Please see #developers or today's Sheriff if you have questions. | ||
The branch approval queue is being monitored by [[Releases/Drivers/Branch|branch drivers]], all of whom are usually available on IRC. | The branch approval queue is being monitored by [[Releases/Drivers/Branch|branch drivers]], all of whom are usually available on IRC. | ||
Revision as of 23:13, 15 November 2011
For comm-central tree rules, see this page.
Not sure which Firefox version is on which branch today? See RapidRelease/Calendar.
mozilla-central (Nightly channel)
- All changes must meet the general checkin rules. You must check the tree before pushing, and watch the tree for failures after pushing.
- Please ask in #developers on IRC if you have questions.
mozilla-inbound
- All changes must meet the general checkin rules, except you do not need to watch the tree after pushing.
- This tree is merged into mozilla-central approximately daily.
- Please read Tree Rules/Inbound for commit procedures and the list of sheriffs.
- Ask in #developers on IRC if you have any questions.
mozilla-aurora
APPROVAL REQUIRED
- All changes must meet the general checkin rules. You must check the tree before pushing, and watch the tree for failures after pushing.
- Patches must have the approval-mozilla-aurora+ flag in Bugzilla. To request approval, set the approval-mozilla-aurora? flag on the patch you wish to check in.
- Patches nominated for aurora should:
- have tests, or a strong statement of what can be done in the absence of tests.
- have landed in mozilla-central to bake on the nightly channel for a few days.
- have a comment in Bugzilla assessing performance impact, risk, and reasons the patch is needed on aurora.
- Approval requests will be processed by release drivers in the weekly Firefox/Channels meetings.
- Set the appropriate "status-firefoxN" flag to "fixed" after landing a fix on the Aurora branch.
mozilla-beta
APPROVAL REQUIRED
- All changes must meet the general checkin rules. You must check the tree before pushing, and watch the tree for failures after pushing.
- Patches must have the approval-mozilla-beta+ flag in Bugzilla. To request approval, set the approval-mozilla-beta? flag on the patch you wish to check in.
- Patches nominated for beta should:
- have tests, or a strong statement of what can be done in the absence of tests.
- have landed in mozilla-central to bake on the nightly channel for a few days.
- have a comment in Bugzilla assessing performance impact, risk, and reasons the patch is needed on beta.
- not change binary interfaces or otherwise break add-on compatibility.
- Approval requests will be processed by release drivers in the weekly Firefox/Channels meetings.
- Set the appropriate "status-firefoxN" flag to "fixed" after landing a fix on the Beta branch.
mozilla-release - Release channel
APPROVAL REQUIRED
- Patches must have the approval-mozilla-release+ flag in Bugzilla. To request approval, set the approval-mozilla-release? flag on the patch you wish to check in.
- In the normal development process, no changes will land on mozilla-release except regular merges from mozilla-beta every six weeks.
- Changes to the release branch are limited to urgent "chemspills" like zero-day security vulnerabilities and other unplanned emergencies. Any changes to this branch will be directly overseen by release drivers.
mozilla-1.9.2 (Firefox 3.6.x)
APPROVAL REQUIRED
- patches must have been checked in and "baked" on mozilla-central,
- patches must have approval1.9.2.x+ (for whatever value of x is relevant).
- Set the "status1.9.2" flag to the relevant "fixed .x" value when the patch has been checked into the branch
- Patches nominated for approval1.9.2.x should:
- have tests, or a strong statement of what can be done in the absence of tests
- have landed on trunk and baked for a few days (at least)
- have an assessment of performance impact
- have an assessment of risk
Please see #developers or today's Sheriff if you have questions.
The branch approval queue is being monitored by branch drivers, all of whom are usually available on IRC.