Confirmed users
396
edits
Sheriffing/How To/Unified Repos: Difference between revisions
hg in equivalent
(new hg pull commands) |
(hg in equivalent) |
||
| Line 110: | Line 110: | ||
* hg out -r . inbound | * hg out -r . inbound | ||
** This will only display the things you're about to push to the inbound branch | ** This will only display the things you're about to push to the inbound branch | ||
=== View incoming changes === | |||
Since your unified repo will likely have all changesets from the various branches pulled locally, `hg in <somebranch> -r <somerev>` will likely not help you see what would be pulled into your current branch from <somebranch> up to that <somerev>. | |||
Instead, you can use the following to print out the equivalent. Say you want to see what would be merged onto mozilla-central from b2g-inbound's revision ca142ec8ba0f: | |||
Make sure m-c is fully up to date: | |||
* hg pull central | |||
* hg up central | |||
Get all of b2g-inbound's changesets: | |||
* hg pull b2ginbound | |||
Do a preview of the merge without actually performing the merge: | |||
* hg merge -r ca142ec8ba0f -P | |||
This will print out everything on b2g-inbound (up to and including revision ca142ec8ba0f) that is not already on mozilla-central. | |||