Confirmed users
355
edits
Services/Process/MergingBetweenBranches: Difference between revisions
Services/Process/MergingBetweenBranches (view source)
Revision as of 17:30, 14 May 2013
, 14 May 2013→Merging from mozilla-central to services-central
Nalexander (talk | contribs) |
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 | * Pull last green changeset into local services-central | ||
hg pull | hg pull ssh://hg.mozilla.org/mozilla-central/ | ||
* | * If necessary (hg reports +1 heads), merge pulled changeset into local services-central | ||
hg merge | hg merge | ||
* Push to services-central (Does services-ops need to do this?) | * Push to services-central (Does services-ops need to do this?) | ||