Confirmed users
611
edits
Sheriffing/How To/Merges: Difference between revisions
Jump to navigation
Jump to search
updated repositories, wrote full repository names to optimize it for search, replaced mcmerge with Bugherder
No edit summary |
(updated repositories, wrote full repository names to optimize it for search, replaced mcmerge with Bugherder) |
||
| Line 1: | Line 1: | ||
'''Merges:''' | '''Merges:''' | ||
''Merging around twice a day to/from | ''Merging around twice a day to/from autoland and mozilla-inbound to mozilla-central'' | ||
'''Merges from the integration trees to | '''Merges from the integration trees to mozilla-central are done on green PGO runs to avoid bustages on PGO which could affect as example Nightly Builds''' | ||
= Step 1= | = Step 1= | ||
Merging from | Merging from autoland and mozilla-inbound to mozilla-central | ||
-> cd into your | Example mozilla-inbound to mozilla-central merge | ||
-> cd into your 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 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 | -> hg merge && hg commit -m "merge inbound to mozilla-central" | ||
-> push | -> push | ||
'''don't forget to use | '''don't forget to use Bugherder after that! It's available from the menu for the push on [https://treeherder.mozilla.org/#/jobs?repo=mozilla-central Treeherder]''' | ||
= Step 2 = | = Step 2 = | ||
Merging back from mozilla-central to autoland and mozilla-inbound | |||
Example mozilla-central to mozilla-inbound merge | |||
-> go to your mozilla-inbound tree directory | |||
-> go to your | |||
-> hg pull && hg update to make sure its the latest | -> hg pull && hg update to make sure its the latest | ||
-> hg pull ssh://hg.mozilla.org/mozilla-central/ | -> hg pull ssh://hg.mozilla.org/mozilla-central/ | ||
-> hg merge | -> hg merge | ||
-> hg commit -m "merge | -> hg commit -m "merge mozilla-central to mozilla-inbound" | ||
-> hg push | -> hg push | ||
since this above might result in race conditions on the tree | since this above might result in race conditions on the tree | ||
(when its busy there) this works better -> | (when its busy there) this works better -> | ||
go to your | go to your mozilla-inbound tree | ||
hg pull && hg update && hg pull ssh://hg.mozilla.org/mozilla-central/ && hg merge && hg commit -m "Merge | hg pull && hg update && hg pull ssh://hg.mozilla.org/mozilla-central/ && hg merge && hg commit -m "Merge mozilla-central to [TREENAME]" && hg push | ||
Aliases for the various repositories make the above easier to type! | Aliases for the various repositories make the above easier to type! | ||