canmove, Confirmed users
1,126
edits
Inbound Sheriff Duty: Difference between revisions
Jump to navigation
Jump to search
Clarifying bug metadata changes when landing on inbound, to speed up merges
(Clarifying bug metadata changes when landing on inbound, to speed up merges) |
|||
| Line 3: | Line 3: | ||
http://hg.mozilla.org/integration/mozilla-inbound | http://hg.mozilla.org/integration/mozilla-inbound | ||
To speedup the cloning you can use the [https://developer.mozilla.org/en/Mozilla_Source_Code_%28Mercurial%29#Bundles mercurial bundle]: | To speedup the cloning you can use the [https://developer.mozilla.org/en/Mozilla_Source_Code_%28Mercurial%29#Bundles mercurial bundle]: | ||
ftp://ftp.mozilla.org/pub/mozilla.org/firefox/bundles/mozilla-inbound.hg | ftp://ftp.mozilla.org/pub/mozilla.org/firefox/bundles/mozilla-inbound.hg | ||
or see [http://jlebar.com/2011/5/20/Faster_and_smaller_clones_of_branches.html this blog post]. | or see [http://jlebar.com/2011/5/20/Faster_and_smaller_clones_of_branches.html this blog post]. | ||
== What are the tree rules for mozilla-inbound? == | == What are the tree rules for mozilla-inbound? == | ||
* '''mozilla-inbound is no replacement for Try''' | *'''mozilla-inbound is no replacement for Try''' | ||
** Please avoid any unnecessary breakage. | **Please avoid any unnecessary breakage. You still need to test your patches on [[Try]] before pushing. | ||
* '''When can I push to mozilla-inbound? Always!''' | *'''When can I push to mozilla-inbound? Always!''' | ||
** If there is something very wrong with mozilla-inbound, a sheriff will close the tree, and your push will fail automatically. | **If there is something very wrong with mozilla-inbound, a sheriff will close the tree, and your push will fail automatically. | ||
* Committers are ''not'' required to actively watch the tree after pushing to mozilla-inbound. | *Committers are ''not'' required to actively watch the tree after pushing to mozilla-inbound. | ||
* Bugs remain open until the changeset makes it to m-c. | *Bugs remain open until the changeset makes it to m-c. | ||
** Optionally add "[inbound]" to the status whiteboard for bugs that have been fixed on mozilla-inbound. | **Add the inbound changeset URL to the bug. | ||
* The Sheriff will watch this tree and back out bustage/regressions as necessary to keep mozilla-inbound green | **Set the target milestone and check assignee/in-testsuite flag when landing on inbound, to save time for the people doing the merges. | ||
** Bustage is backed out right away. There's no "we'll let you fix this tree while everybody stands by". | **<strike>Optionally add "[inbound]" to the status whiteboard for bugs that have been fixed on mozilla-inbound.</strike> Means the merges take even longer, so better to just add the inbound changeset URL as a comment. | ||
** Changes landed on top of bustage will be backed out to minimize overhead/time to fix the tree. They will be relanded by the sheriff once the bustage is cleared. | *The Sheriff will watch this tree and back out bustage/regressions as necessary to keep mozilla-inbound green | ||
** 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] | **Bustage is backed out right away. There's no "we'll let you fix this tree while everybody stands by". | ||
* Once or more a day, the sheriff will merge a green -inbound changeset to -central | **Changes landed on top of bustage will be backed out to minimize overhead/time to fix the tree. They will be relanded by the sheriff once the bustage is cleared. | ||
** Resolve bugs that were landed, set appropriate target milestone. | **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] | ||
* Push to mozilla-inbound like any special branch, that is, it is recommended to have a separate local tree. Pull to it, apply your patches, and then push to mozilla-inbound. | *Once or more a day, the sheriff will merge a green -inbound changeset to -central | ||
**Resolve bugs that were landed, set appropriate target milestone. | |||
*Push to mozilla-inbound like any special branch, that is, it is recommended to have a separate local tree. Pull to it, apply your patches, and then push to mozilla-inbound. | |||
== Who manages mozilla-inbound? == | == Who manages mozilla-inbound? == | ||
* bz (EDT/UTC-0400) | *bz (EDT/UTC-0400) | ||
* ehsan (EST) (not a morning person, so might be kind of similar to PDT!) | *ehsan (EST) (not a morning person, so might be kind of similar to PDT!) | ||
* khuey | *khuey | ||
* mak (CEST/UTC+0200) | *mak (CEST/UTC+0200) | ||
* mbrubeck (PDT/UTC-0700) | *mbrubeck (PDT/UTC-0700) | ||
* volkmar (Late European TZ) | *volkmar (Late European TZ) | ||
* philikon (CEST/UTC+0200) | *philikon (CEST/UTC+0200) | ||
* rnewman (irregular hours for personal reasons; PDT) | *rnewman (irregular hours for personal reasons; PDT) | ||