Sheriffing/How To/Merges

Merges:

Merging around twice a day to/from m-i, fx-team and b2g inbound to m-c

Merges from the integration trees to m-c are done on green PGO runs to avoid bustages on PGO which could affect as example Nightly BuildsItalic text

Step 1

Merging from m-i,fx-team and b2g-inbound to m-c

-> cd into your mc directory
-> hg pull ssh://hg.mozilla.org/integration/mozilla-inbound -r (the green with PGO runs inbound revision changeset) - also make sure there are no backouts  after that etc
-> hg merge && hg commit -m "merge inbound to mc"
-> push

don't forget to use mc-merge tool after that!

Step 2

Merging back from m-c to fx-team,m-i and b2g-inbound

Example mc to inbound merge
-> go to your m-i tree directory
-> hg pull && hg update to make sure its the latest
-> hg pull ssh://hg.mozilla.org/mozilla-central/
-> hg merge
-> hg commit -m "merge bla to bla"
-> hg push
since this above might result in race conditions on the tree (when its busy there) this works better -> hg pull && hg update  && hg merge && hg commit -m  "Merge m-c to [TREENAME]" && hg push 

Aliases for the various repositories make the above easier to type!