canmove, Confirmed users
2,850
edits
Sheriffing/How To/Landing patches: Difference between revisions
Jump to navigation
Jump to search
no edit summary
(Removed mention of mcMerge (not needed anymore, now done automatically)) |
ChrisCooper (talk | contribs) No edit summary |
||
| Line 1: | Line 1: | ||
Sheriffs have the responsibility for landing checkin-needed patches on behalf of others who do not have the needed commit access to do so themselves or those who do not have the ability to watch their pushes afterwards. | |||
= Bugzilla queries for patches requiring check-in = | |||
* [https://bugzilla.mozilla.org/buglist.cgi?order=Bug%20Number;resolution=---;resolution=FIXED;field0-0-0=keywords;type0-0-0=anywordssubstr;value0-0-0=checkin-needed;field0-0-1=status_whiteboard;type0-0-1=substring;value0-0-1=checkin-needed;field0-0-2=flagtypes.name;type0-0-2=equals;value0-0-2=checkin%3F; Bugs with checkin-needed or checkin? requests set in all components] | * [https://bugzilla.mozilla.org/buglist.cgi?order=Bug%20Number;resolution=---;resolution=FIXED;field0-0-0=keywords;type0-0-0=anywordssubstr;value0-0-0=checkin-needed;field0-0-1=status_whiteboard;type0-0-1=substring;value0-0-1=checkin-needed;field0-0-2=flagtypes.name;type0-0-2=equals;value0-0-2=checkin%3F; Bugs with checkin-needed or checkin? requests set in all components] | ||
* [http://mzl.la/1qLItZf Bugs with checkin-needed or checkin? requests set excluding non-core components] | * [http://mzl.la/1qLItZf Bugs with checkin-needed or checkin? requests set excluding non-core components] | ||
** This is now available as a shared saved search for anyone with editbugs permissions on bugzilla. Go [https://bugzilla.mozilla.org/userprefs.cgi?tab=saved-searches here] and search for "checkin-needed-core" to find it in the list, and you can add it to Bugzilla's footer. | ** This is now available as a shared saved search for anyone with editbugs permissions on bugzilla. Go [https://bugzilla.mozilla.org/userprefs.cgi?tab=saved-searches here] and search for "checkin-needed-core" to find it in the list, and you can add it to Bugzilla's footer. | ||
= How to land check-in needed patches = | |||
* <u><b>Verify that the patch has proper review before doing anything else</b></u> | * <u><b>Verify that the patch has proper review before doing anything else</b></u> | ||
** [https://wiki.mozilla.org/Modules Module information] | ** [https://wiki.mozilla.org/Modules Module information] | ||
* | * Saving the attachment from the bug. | ||
** For | * Apply the patch to the appropriate repository using <code>hg import</code> (preferred) or <code>patch</code>. | ||
** For almost all patches, the appropriate repository is mozilla-inbound. | |||
* If the patch does not apply cleanly, you can try to [https://mozilla-version-control-tools.readthedocs.io/en/latest/hgmozilla/extensions.html#core-extensions-to-perform-history-rewriting rebase]. If that doesn't solve the issue, your best course of action is to remove the checkin-needed request and ask the developer to post an updated patch for check-in. If you understand the code very well or the conflicts are extremely trivial, you can try to resolve the conflicts yourself, but note that '''YOU''' are now on the hook for this patch too. | |||
* If the patch does not apply cleanly, you can | |||
* Once the patch applies cleanly, verify that the commit information is correct: | * Once the patch applies cleanly, verify that the commit information is correct: | ||
** Author (use the information from their Bugzilla account if needed) | ** Author (use the information from their Bugzilla account if needed) | ||