49
edits
(Update manual cherry-pick section to match what is currently necessary. Also reformat the page to make it easier to read, using sub-bullets, and using code annotations.) |
(Fix: first ref is the rev before, not the rev of the patch to uplift. Add concrete example of uplifting a specific revision. Include `-i` for interactivity, add --no-wip to prevent WIP patches) |
||
| Line 47: | Line 47: | ||
# Use <code>moz-phab uplift --list-trains</code> to determine which uplift train you want to request an uplift for. | # Use <code>moz-phab uplift --list-trains</code> to determine which uplift train you want to request an uplift for. | ||
#* Note: Train names generally start with <code>firefox-</code> and are not simply the branch name. | #* Note: Train names generally start with <code>firefox-</code> and are not simply the branch name. | ||
# Run <code>moz-phab uplift --train <train> <first | # Run <code>moz-phab uplift --train <train> <revision before first of patches to uplift> <last revision of patches to uplift></code>. | ||
#* This will create new revisions in Phabricator that will be uplifted to the specified train. | #* This will create new revisions in Phabricator that will be uplifted to the specified train. | ||
#* Most of the arguments to <code>moz-phab uplift</code> are the same as <code>moz-phab submit</code>. | #* Most of the arguments to <code>moz-phab uplift</code> are the same as <code>moz-phab submit</code>. | ||
| Line 66: | Line 66: | ||
# Use <code>moz-phab uplift --list-trains</code> to determine which uplift train you want to request an uplift for. | # Use <code>moz-phab uplift --list-trains</code> to determine which uplift train you want to request an uplift for. | ||
#* Note: Train names generally start with <code>firefox-</code> and are not simply the branch name. | #* Note: Train names generally start with <code>firefox-</code> and are not simply the branch name. | ||
# Submit the uplifts using <code>moz-phab uplift --no-rebase --train <train name> <first | # Submit the uplifts using <code>moz-phab uplift --no-rebase --train <train name> <revision before first of patches to uplift> <last revision of patches to uplift></code> | ||
#* Example of uplifting one patch to ESR140: <code>moz-phab uplift --no-rebase --train firefox-esr140 -i --no-wip HEAD^ HEAD</code> (<code>HEAD^</code> means the penultimate commit). | |||
# Open the URL as suggested at the bottom of the output. | # Open the URL as suggested at the bottom of the output. | ||
# Complete the uplift request form. See the section below on how to submit the form. | # Complete the uplift request form. See the section below on how to submit the form. | ||
edits