canmove, Confirmed users
2,850
edits
Tree Rules/Integration: Difference between revisions
Jump to navigation
Jump to search
no edit summary
ChrisCooper (talk | contribs) No edit summary |
ChrisCooper (talk | contribs) No edit summary |
||
| Line 1: | Line 1: | ||
= What are integration repositories? = | |||
Repositories such as [https://treeherder.mozilla.org/#/jobs?repo=autoland autoland] and [https://treeherder.mozilla.org/#/jobs?repo=mozilla-inbound mozilla-inbound] are integration branch that merge to and from mozilla-central about once a day. They're a place where changes can land and be tested without risk of breaking the main mozilla-central trunk. | Repositories such as [https://treeherder.mozilla.org/#/jobs?repo=autoland autoland] and [https://treeherder.mozilla.org/#/jobs?repo=mozilla-inbound mozilla-inbound] are integration branch that merge to and from mozilla-central about once a day. They're a place where changes can land and be tested without risk of breaking the main mozilla-central trunk. | ||
= Working with integration repositories = | |||
It is recommended that you use the [http://mozilla-version-control-tools.readthedocs.io/en/latest/hgmozilla/unifiedrepo.html Unified Firefox Repository] | |||
* | * https://hg.mozilla.org/mozilla-unified/ | ||
= What are the tree rules for integration repositories? == | |||
* Follow the '''[https://developer.mozilla.org/En/Developer_Guide/Committing_Rules_and_Responsibilities general rules for committing]''', ''except'': | * Follow the '''[https://developer.mozilla.org/En/Developer_Guide/Committing_Rules_and_Responsibilities general rules for committing]''', ''except'': | ||
** Committers are ''not'' required to actively watch the tree after pushing to an integration repository. | ** Committers are ''not'' required to actively watch the tree after pushing to an integration repository. | ||
| Line 19: | Line 18: | ||
** It is recommended to have a separate local clone. Pull to it, apply your patches, and then push to the integration repository. | ** It is recommended to have a separate local clone. Pull to it, apply your patches, and then push to the integration repository. | ||
= Please do the following after pushing to an integration repository = | |||
* '''Leave bugs open'''. The sheriff will resolve them when they are merged to m-c. | * '''Leave bugs open'''. The sheriff will resolve them when they are merged to m-c. | ||
* '''Add the "leave-open" keyword''' if the bug should not be resolved fixed after the merge to m-c. (We're now using a new semi-automated tool - bug comments won't be seen). | * '''Add the "leave-open" keyword''' if the bug should not be resolved fixed after the merge to m-c. (We're now using a new semi-automated tool - bug comments won't be seen). | ||
| Line 29: | Line 28: | ||
* There is no need to add "[inbound]" to the status whiteboard any more, but you may still do so if it helps with tracking your assigned bugs. | * There is no need to add "[inbound]" to the status whiteboard any more, but you may still do so if it helps with tracking your assigned bugs. | ||
= Sheriff Duty = | |||
* Sheriffs will watch this tree and back out bustage/regressions as necessary to keep it green. | * Sheriffs will watch this tree and back out bustage/regressions as necessary to keep it green. | ||
** Bustage is backed out right away. There's no "we'll let you fix this tree while everybody stands by". | ** Bustage is backed out right away. There's no "we'll let you fix this tree while everybody stands by". | ||
| Line 42: | Line 40: | ||
** When merging inaccessible security fixes, send email to the bug assignee and Cc the reviewer, to politely ask them to resolve their bug. | ** When merging inaccessible security fixes, send email to the bug assignee and Cc the reviewer, to politely ask them to resolve their bug. | ||
= Meet the Sheriffs = | |||
The integration repositories are managed by group of sheriffs, please be nice with them. If you have any doubts or questions about the above process, you can ping any of them in #developers channel. | |||
The integration repositories are managed by group of sheriffs, please be nice with them. | |||
For the list of people to look out for, see [[Sheriffing#Meet_the_Sheriffs|Meet the Sheriffs]]. | For the list of people to look out for, see [[Sheriffing#Meet_the_Sheriffs|Meet the Sheriffs]]. | ||