Services/Process/MergingBetweenBranches: Difference between revisions

Line 7: Line 7:
== 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/
hg pull ssh://hg.mozilla.org/mozilla-central/
* If necessary (hg reports +1 heads), merge pulled changeset into local services-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?)
  hg push ssh://hg.mozilla.org/services/services-central
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.
* Verify green build in [https://tbpl.mozilla.org/?tree=Services-Central TBPL], including TPS (formerly Crossweave) — wait for the email.
* Perform frequently!
* Perform frequently!
Confirmed users
355

edits