Confirmed users
396
edits
Jetpack/Integration Process: Difference between revisions
First pass of updating integration process with our new branching system
(First pass of updating integration process with our new branching system) |
|||
| Line 1: | Line 1: | ||
This page should include instructions on updating mozilla | This page should include instructions on updating mozilla-inbound with the latest version of the SDK code. | ||
= Updating up the | = From Git... = | ||
== Create a new version branch == | |||
From your SDK repository: | |||
# assuming you're merging the head from master: | |||
git checkout master | |||
git pull origin master | |||
git checkout -b firefoxXX #where XX is the new Firefox version number on inbound | |||
git push -u origin firefoxXX | |||
This creates a new firefoxXX branch in git and pushes it to the upstream repository for use. This new branch will track whatever code is in the SDK's folder in mercurial. | |||
== Updating that branch == | |||
Pick up new changes from the master branch every week or as needed: | |||
# merge master to firefoxXX directly: | |||
git checkout master | |||
git pull origin master | |||
git merge master firefoxXX # XX is the current m-i version number | |||
git push origin firefoxXX | |||
= From Mercurial = | |||
== If you haven't checked out from mercurial before == | == If you haven't checked out from mercurial before == | ||