Confirmed users
396
edits
Sheriffing/How To/Unified Repos: Difference between revisions
m
Drop references to fx-team
ChrisCooper (talk | contribs) m (ChrisCooper moved page Sheriffing/How:To:SheriffingFromUnifiedRepos to Sheriffing/How To/Unified Repos: More intuitive naming scheme) |
m (Drop references to fx-team) |
||
| Line 54: | Line 54: | ||
== Checkin-neededs == | == Checkin-neededs == | ||
This assumes we're checking things in to | This assumes we're checking things in to autoland. Replace autoland with another branch name as needed. | ||
==== Single repository and single set of patches ==== | ==== Single repository and single set of patches ==== | ||
Update | Update autoland and prepare for the patches: | ||
* hg pull | * hg pull autoland | ||
* hg up | * hg up autoland | ||
* hg bookmark | * hg bookmark autoland-checkins | ||
Import the patches: | Import the patches: | ||
* hg import https://link.to/correct/checkin-needed.patch | * hg import https://link.to/correct/checkin-needed.patch | ||
* Repeat ^ as needed for all | * Repeat ^ as needed for all autoland checkin-needed patches | ||
Verify your outgoing changes: | Verify your outgoing changes: | ||
* hg out -r . | * hg out -r . autoland | ||
If you haven't lost a push race: | If you haven't lost a push race: | ||
* hg push -r . | * hg push -r . autoland | ||
If you lost a push race: | If you lost a push race: | ||
* hg pull | * hg pull autoland | ||
* hg rebase -d | * hg rebase -d autoland | ||
* hg push -r . | * hg push -r . autoland | ||
Delete your no longer needed bookmark: | Delete your no longer needed bookmark: | ||
* hg bookmark -d | * hg bookmark -d autoland-checkins | ||
==== Multiple repositories with a single set of patches each ==== | ==== Multiple repositories with a single set of patches each ==== | ||
You can set up multiple sets of patches at once against multiple repositories: | You can set up multiple sets of patches at once against multiple repositories: | ||
Update | Update autoland | ||
* hg pull | * hg pull autoland && hg up autoland | ||
Create a bookmark to base your | Create a bookmark to base your autoland checkin-needed patches | ||
* hg bookmark | * hg bookmark autoland-checkins | ||
Import a bunch of patches against | Import a bunch of patches against autoland | ||
* hg import <patch1> | * hg import <patch1> | ||
* hg import <patch2> | * hg import <patch2> | ||
| Line 93: | Line 93: | ||
* hg push -r . inbound # this only pushes patch3 and patch4 | * hg push -r . inbound # this only pushes patch3 and patch4 | ||
* hg bookmark -d inbound-checkins # delete inbound's checkin bookmark as it's not needed | * hg bookmark -d inbound-checkins # delete inbound's checkin bookmark as it's not needed | ||
Go back to your | Go back to your autoland checkins and add another patch to the bookmark, then push it | ||
* hg up | * hg up autoland-checkins | ||
* hg import <patch5> | * hg import <patch5> | ||
* hg out -r . | * hg out -r . autoland # this will be patch1, patch2, and patch5 | ||
* hg push -r . | * hg push -r . autoland | ||
* hg bookmark -d | * hg bookmark -d autoland-checkins | ||
==== Single repository with multiple sets of patches ==== | ==== Single repository with multiple sets of patches ==== | ||
Or have multiple sets of patches against a single repository: | Or have multiple sets of patches against a single repository: | ||
Update | Update autoland | ||
* hg pull | * hg pull autoland && hg up autoland | ||
Make the first bookmark/set | Make the first bookmark/set | ||
* hg bookmark | * hg bookmark autoland-checkins-1 | ||
* hg import <patch1> | * hg import <patch1> | ||
* hg import <patch2> | * hg import <patch2> | ||
Make the second set | Make the second set | ||
* hg up | * hg up autoland && hg bookmark autoland-checkins-2 | ||
* hg import <patch3> | * hg import <patch3> | ||
* hg import <patch4> | * hg import <patch4> | ||
See what's going to be pushed in each | See what's going to be pushed in each | ||
* hg out -r . | * hg out -r . autoland # patch3 and patch4 | ||
* hg up | * hg up autoland-checkins-1 && hg out -r . autoland # patch1 and patch2 | ||
Push the first set | Push the first set | ||
* hg push -r . | * hg push -r . autoland # pushes patch1 and patch2 | ||
Get ready to push the second set | Get ready to push the second set | ||
* hg up | * hg up autoland-checkins-2 | ||
* hg rebase -d | * hg rebase -d autoland # Rebase the second set onto the now-pushed first set | ||
And push it | And push it | ||
* hg push -r . | * hg push -r . autoland # pushes patch3 and patch4 | ||
Delete the now-unneeded bookmarks | Delete the now-unneeded bookmarks | ||
* hg bookmark -d | * hg bookmark -d autoland-checkins-1 | ||
* hg bookmark -d | * hg bookmark -d autoland-checkins-2 | ||
== Uplifts == | == Uplifts == | ||