Confirmed users
396
edits
Jetpack/Integration Process: Difference between revisions
no edit summary
No edit summary |
|||
| Line 9: | Line 9: | ||
git checkout master | git checkout master | ||
git pull origin master | git pull origin master | ||
git checkout -b firefoxXX #where XX is the new Firefox version number on inbound | git checkout -b <i>firefoxXX</i> #where XX is the new Firefox version number on inbound | ||
git push -u origin firefoxXX | git push -u origin <i>firefoxXX</i> | ||
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. | This creates a new <i>firefoxXX</i> 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 == | == Updating that branch == | ||
Pick up new changes from the master branch every week or as needed: | Pick up new changes from the master branch every week or as needed: | ||
# merge master to firefoxXX directly: | # merge master to <i>firefoxXX</i> directly: | ||
git checkout master | git checkout master | ||
git pull origin master | git pull origin master | ||
git merge master firefoxXX # XX is the current m-i version number | git merge master <i>firefoxXX</i> # XX is the current m-i version number | ||
git push origin firefoxXX | git push origin <i>firefoxXX</i> | ||
= From Mercurial = | = From Mercurial = | ||
| Line 31: | Line 31: | ||
git remote add origin git@github.com:mozilla/addon-sdk.git | git remote add origin git@github.com:mozilla/addon-sdk.git | ||
git fetch origin | git fetch origin | ||
git checkout -f firefoxXX #where XX is the current version you're uplifting to | git checkout -f <i>firefoxXX</i> #where XX is the current version you're uplifting to | ||
This will give you the latest mozilla-inbound code and update the SDK files to the latest versions from the firefoxXX branch, in some cases that might be newer than those already in mozilla-inbound. | This will give you the latest mozilla-inbound code and update the SDK files to the latest versions from the <i>firefoxXX</i> branch, in some cases that might be newer than those already in mozilla-inbound. | ||
== If you have previously done the above == | == If you have previously done the above == | ||
| Line 40: | Line 40: | ||
hg pull -u | hg pull -u | ||
cd addon-sdk/source | cd addon-sdk/source | ||
git reset --hard firefoxXX # undoes any backouts that happened in hg, XX is current m-i version number | git reset --hard <i>firefoxXX</i> # undoes any backouts that happened in hg, XX is current m-i version number | ||
git pull origin firefoxXX | git pull origin <i>firefoxXX</i> | ||
Updates the Firefox and SDK files to the latest versions from the integration branch. | Updates the Firefox and SDK files to the latest versions from the integration branch. | ||