The Autoland Repo is part of a future plan to get rid of merge commits: https://bugzilla.mozilla.org/show_bug.cgi?id=1266863

Where to find autoland

https://hg.mozilla.org/integration/autoland

Currently all mozreview autoland commits go to autoland

Handling by Sheriffs

There are future plans to rebase autoland to m-c and to get rid of merges and backout commits etc. There will be tools but as of July 4th 2016 current state for sheriffs is:

• Autoland is handled as we mozilla-inbound / fx-team with means
  • Backouts will happen when regressions occur
  • Staring as usual
  • Is part of merges/updates from/to m-c (since we prefer rebase autoland to m-c please try to update auto-land to m-c first before fx-team and mozilla-inbound

Handling conflicts with especially mozilla-inbound

Code might be changed in parallel in mozilla-inbound & autoland and this might result in merge conflicts.

Here is some concept how to handle such situations:

1. back out conflicting commit(s) from inbound
2. merge the commit before the backed out commit from inbound to central (this ensures that at least some commits from inbound are merged into central)
3. merge central into inbound (on top of the backout commits you just landed)

Just be sure that when you do step 2 that there no other regressions etc that you might merge into central. Otherwise you have to wait till you have a mergeable changeset (with pgo run etc) from you commit from step 1.

Need help

If you have questions about autoland please ping: gps, Tomcat, Kwierso