Sheriffing/How To/Unified Repos: Difference between revisions

* http://mozilla-version-control-tools.readthedocs.org/en/latest/hgmozilla/unifiedrepo.html

* https://mozilla-version-control-tools.readthedocs.org/en/latest/hgmozilla/firefoxtree.html

* Set up your ssh key yourself

* Install [https://www.mercurial-scm.org/downloads Mercurial 4.2] or higher

* hg pull releases # this will pull from pretty much every release branch (FYI: including old, unused branches)

This assumes you have your unified repo all set up so that `hg fxheads` lists each of central, autoland, and inbound.

* If the `hg merge central` command results in "abort: nothing to merge", you should instead use `hg update -r <mozilla-central's tip revision>` to do a non-merging update, then you can do `hg push -r . inbound` to push it as usual.

This assumes we're checking things in to fx-team. Replace fx-team with another branch name as needed.

Update fx-team and prepare for the patches:

* hg pull fx-team

* hg bookmark -d fx-team-checkins

You can set up multiple sets of patches at once against multiple repositories:

Update fx-team

* hg bookmark -d fxteam-checkins

Or have multiple sets of patches against a single repository:

Update fx-team

* hg bookmark -d fxteam-checkins-2

If branch-specific patches are posted, follow the checkin-needed instructions above, importing the patches onto the release branch.

Read the documentation for [https://mozilla-version-control-tools.readthedocs.org/en/latest/hgmozilla/unifiedrepo.html#uplifting-backporting-commits graft] for further help.

Better tools are coming:

* https://bugzilla.mozilla.org/show_bug.cgi?id=1117632

(Omit oops's -s flag to back out each individual revision in the range as a separate commit.)

* `hg graft`, see https://mozilla-version-control-tools.readthedocs.org/en/latest/hgmozilla/common.html#revive-a-commit-that-was-backed-out

This assumes you have commits you're attempting to push to mozilla-inbound when you lose a push race with someone. Change `inbound` to the correct branch name as needed.

* hg push -r . inbound

<big>WARNING:</big> This will strip out any commits that haven't been pushed to the remote repositories, regardless of what branch/label/tag those commits are on. (So if you have local changes on inbound and run this command to strip something bad on fx-team, both inbound and fx-team will be stripped.) Only do this if you don't care about any of those commits!

* hg strip 'not public()'

* hg up -C

`hg out` without any flags added will show you a LOT of unrelated commits. To see just what you'll be pushing to a given branch, use `hg out -r . <branch>`

* hg out -r . inbound

** This will only display the things you're about to push to the inbound branch

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:

This will print out everything on b2g-inbound (up to and including revision ca142ec8ba0f) that is not already on mozilla-central.

* hg log -fr [branch]