Confirmed users
396
edits
Sheriffing/How To/Unified Repos: Difference between revisions
Jump to navigation
Jump to search
Uplift instructions
(Checkin-needed documentation) |
(Uplift instructions) |
||
| Line 67: | Line 67: | ||
=== Uplifts === | === Uplifts === | ||
If branch-specific patches are posted, follow the checkin-needed instructions above, importing the patches onto the release branch. | |||
If you're uplifting directly from an m-c checkin to aurora: | |||
Pull and update to prepare for the uplifts: | |||
* hg pull central | |||
* hg pull aurora | |||
* hg up aurora | |||
Graft the mc commit and bring up the editor to edit the commit message, adding "a=foo" as needed: | |||
* hg graft --edit -r <revision> | |||
Repeat the previous step as needed for all uplifts as needed. | |||
Verify the outgoing changes and push: | |||
* hg out -r . aurora | |||
* hg push -r . aurora | |||
You can graft a range of commits at once if that's easier: | |||
* hg graft -r <toprevision><bottomrevision> | |||
Read the documentation for [https://mozilla-version-control-tools.readthedocs.org/en/latest/hgmozilla/unifiedrepo.html#uplifting-backporting-commits graft] for further help. | |||
=== Rebasing after losing a push race === | === Rebasing after losing a push race === | ||