Jetpack/Integration Process: Difference between revisions
| Line 10: | Line 10: | ||
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 | git checkout -f firefoxXX #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 | 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. | ||
== If you have previously done the above == | == If you have previously done the above == | ||
| Line 19: | Line 19: | ||
hg pull -u | hg pull -u | ||
cd addon-sdk/source | cd addon-sdk/source | ||
git reset --hard | git reset --hard firefoxXX # undoes any backouts that happened in hg, XX is current m-i version number | ||
git pull origin | git pull origin firefoxXX | ||
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. | ||
Revision as of 20:22, 1 July 2013
This page should include instructions on updating mozilla central with the latest version of the SDK code.
Updating up the local clone
If you haven't checked out from mercurial before
hg clone https://hg.mozilla.org/integration/mozilla-inbound/ inbound cd inbound/addon-sdk/source git init git remote add origin git@github.com:mozilla/addon-sdk.git git fetch origin git checkout -f firefoxXX #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.
If you have previously done the above
cd inbound hg pull -u cd addon-sdk/source git reset --hard firefoxXX # undoes any backouts that happened in hg, XX is current m-i version number git pull origin firefoxXX
Updates the Firefox and SDK files to the latest versions from the integration branch.
Testing changes
Before committing you can test your changes by pushing to the try server. You need to have mercurial queues enabled for this to work.
hg addremove addon-sdk/source hg qnew -f -m "<commit message>" testpatch
Creates a temporary commit that can be pushed to try. Include the output of TryChooser to restrict builds and tests.
hg push -f ssh://hg.mozilla.org/try/
Pushes the temporary commit to the try server, depending on your TryChooser string you should get an email telling you where to look for results.
Once you're done the following converts the temporary commit to a real commit that can be pushed to the project branch:
hg qfinish -a
Viewing and committing changes
If you haven't done the commit by the above method then you can do it like this:
hg diff
Shows the list of changes waiting to land in larch
hg addremove hg commit -m "..."
Commits the changes
Pushing the changes to the project branch
hg push ssh://hg.mozilla.org/integration/mozilla-inbound/
Pushes the changes to mozilla-inbound.