Confirmed users
595
edits
Tree Rules/Integration: Difference between revisions
m
Update sheriff duties based on recent discussions
m (→Sheriff Duty) |
m (Update sheriff duties based on recent discussions) |
||
| Line 37: | Line 37: | ||
* 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". | ||
** | ** If it's not possible to identify the guilty changeset, the sheriffs may backout more changesets to minimize the overhead/time to fix the tree. The innocent ones will be relanded by the sheriff once the bustage is cleared or, in case of doubts, a Try server run will be requested in the bug, before the next landing. | ||
** See ehsan's blogpost on how to [http://ehsanakhgari.org/blog/2010-09-09/backing-out-multiple-consecutive-changesets-mercurial back out multiple consecutive changesets], or mak's [https://wiki.mozilla.org/User:Mak77 backout shell script] (it will bail out on complicate backouts involving conflicts, those few ones should be done manually). | ** See ehsan's blogpost on how to [http://ehsanakhgari.org/blog/2010-09-09/backing-out-multiple-consecutive-changesets-mercurial back out multiple consecutive changesets], or mak's [https://wiki.mozilla.org/User:Mak77 backout shell script] (it will bail out on complicate backouts involving conflicts, those few ones should be done manually). | ||
* About once a day or more, merge a green mozilla-inbound | * About once a day or more, merge a green mozilla-inbound push with valid PGO results to mozilla-central. | ||
** If the push includes compiled files or changes to configure/Makefiles it must have green PGO builds. Otherwise, the first push before it including such changes must have them. | |||
** Also merge mozilla-central to mozilla-inbound. Merge sooner any large or disruptive changes from central. | ** Also merge mozilla-central to mozilla-inbound. Merge sooner any large or disruptive changes from central. | ||
** Resolve bugs that were landed, set appropriate target milestone. | ** Resolve bugs that were landed, set appropriate target milestone. | ||
** When merging not accessible security fixes, send a mail to the bug assignee and Cc the reviewer, to politely ask them to resolve their bug. | |||
== Meet the Sheriffs == | == Meet the Sheriffs == | ||