Confirmed users
396
edits
Sheriffing/How To/Unified Repos: Difference between revisions
Jump to navigation
Jump to search
m
Sheriffing/How To/Unified Repos (view source)
Revision as of 00:43, 7 February 2015
, 7 February 2015Formatting fix
(Add more examples for checkin-neededs) |
m (Formatting fix) |
||
| Line 73: | Line 73: | ||
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 fx-team | |||
* hg pull fx-team && hg up fx-team | * hg pull fx-team && hg up fx-team | ||
Create a bookmark to base your fx-team checkin-needed patches | |||
* hg bookmark fxteam-checkins | * hg bookmark fxteam-checkins | ||
Import a bunch of patches against fx-team | |||
* hg import <patch1> | * hg import <patch1> | ||
* hg import <patch2> | * hg import <patch2> | ||
Update inbound and make a bookmark for inbound patches | |||
* hg pull inbound && hg up inbound && hg bookmark inbound-checkins | * hg pull inbound && hg up inbound && hg bookmark inbound-checkins | ||
Import some patches against inbound | |||
* hg import <patch3> | * hg import <patch3> | ||
* hg import <patch4> | * hg import <patch4> | ||
See what you'd be pushing to inbound and push it | |||
* hg out -r . inbound # this will only show patch3 and patch4 | * hg out -r . inbound # this will only show patch3 and patch4 | ||
* 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 fx-team checkins and add another patch to the bookmark, then push it | |||
* hg up fxteam-checkins | * hg up fxteam-checkins | ||
* hg import <patch5> | * hg import <patch5> | ||
| Line 97: | Line 97: | ||
Or have multiple sets of patches against a single repository: | Or have multiple sets of patches against a single repository: | ||
Update fx-team | |||
* hg pull fx-team && hg up fx-team | * hg pull fx-team && hg up fx-team | ||
Make the first bookmark/set | |||
* hg bookmark fxteam-checkins-1 | * hg bookmark fxteam-checkins-1 | ||
* hg import <patch1> | * hg import <patch1> | ||
* hg import <patch2> | * hg import <patch2> | ||
Make the second set | |||
* hg up fx-team && hg bookmark fxteam-checkins-2 | * hg up fx-team && hg bookmark fxteam-checkins-2 | ||
* hg import <patch3> | * hg import <patch3> | ||
* hg import <patch4> | * hg import <patch4> | ||
See what's going to be pushed in each | |||
* hg out -r . fx-team # patch3 and patch4 | * hg out -r . fx-team # patch3 and patch4 | ||
* hg up fxteam-checkins-1 && hg out -r . fx-team # patch1 and patch2 | * hg up fxteam-checkins-1 && hg out -r . fx-team # patch1 and patch2 | ||
Push the first set | |||
* hg push -r . fx-team # pushes patch1 and patch2 | * hg push -r . fx-team # pushes patch1 and patch2 | ||
Get ready to push the second set | |||
* hg up fxteam-checkins-2 | * hg up fxteam-checkins-2 | ||
* hg rebase -d fx-team # Rebase the second set onto the now-pushed first set | * hg rebase -d fx-team # Rebase the second set onto the now-pushed first set | ||
And push it | |||
* hg push -r . fx-team # pushes patch3 and patch4 | * hg push -r . fx-team # pushes patch3 and patch4 | ||
Delete the now-unneeded bookmarks | |||
* hg bookmark -d fxteam-checkins-1 | * hg bookmark -d fxteam-checkins-1 | ||
* hg bookmark -d fxteam-checkins-2 | * hg bookmark -d fxteam-checkins-2 | ||