Confirmed users
355
edits
Services/Process/MergingBetweenBranches: Difference between revisions
Services/Process/MergingBetweenBranches (view source)
Revision as of 17:20, 14 May 2013
, 14 May 2013→Merging from mozilla-central to services-central
(Adding tree closure info.) |
Nalexander (talk | contribs) |
||
| Line 6: | Line 6: | ||
* Any features requiring server-side deployments/changes must wait until those pieces are live on stage before merging | * Any features requiring server-side deployments/changes must wait until those pieces are live on stage before merging | ||
== Merging from mozilla-central to services-central == | == Merging from mozilla-central to services-central == | ||
* Pull last green changeset into local services-central | * Pull last green changeset into local services-central | ||
hg pull ssh://hg.mozilla.org/mozilla-central/ | |||
* Merge pulled changeset into local services-central | |||
hg merge | |||
* Push to services-central (Does services-ops need to do this?) | * Push to services-central (Does services-ops need to do this?) | ||
* Verify green build in tbpl, including TPS (formerly Crossweave) — wait for the email. | hg push ssh://hg.mozilla.org/services/services-central | ||
* Verify green build in [https://tbpl.mozilla.org/?tree=Services-Central TBPL], including TPS (formerly Crossweave) — wait for the email. | |||
* Perform frequently! | * Perform frequently! | ||
== Merging from services-central to mozilla-central == | == Merging from services-central to mozilla-central == | ||
* Ensure all required changes have landed and the tree is green | * Ensure all required changes have landed and the tree is green | ||