Confirm
567
edits
Changes
updated repositories, wrote full repository names to optimize it for search, replaced mcmerge with Bugherder
'''Merges:'''
''Merging around twice a day to/from mautoland and mozilla-i, fx-team and b2g inbound to mmozilla-ccentral''
'''Merges from the integration trees to mmozilla-c central are done on green PGO runs to avoid bustages on PGO which could affect as example Nightly Builds'''
= Step 1=
Merging from m-i,fx-team autoland and b2gmozilla-inbound to mmozilla-ccentral
Example mozilla-inbound to mozilla-central merge -> cd into your mc mozilla-central 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 mcmozilla-central"
-> push
'''don't forget to use mc-merge tool Bugherder after that!It's available from the menu for the push on [https://treeherder.mozilla.org/#/jobs?repo=mozilla-central Treeherder]'''
= Step 2 =
Merging back from mozilla-central to autoland and mozilla-inbound
-> 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 mozilla-central to blamozilla-inbound"
-> hg push
since this above might result in race conditions on the tree
(when its busy there) this works better ->
go to your mmozilla-i inbound tree hg pull && hg update && hg pull ssh://hg.mozilla.org/mozilla-central/ && hg merge && hg commit -m "Merge mmozilla-c central to [TREENAME]" && hg push
Aliases for the various repositories make the above easier to type!
