canmove, Confirmed users
1,570
edits
Jetpack/Integration Process: Difference between revisions
Jump to navigation
Jump to search
no edit summary
No edit summary |
|||
| Line 45: | Line 45: | ||
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. | ||
== Checking changes == | |||
After updating the git and hg repositories you should add any new files from git and verify you haven't accidentally changed anything outside the add-on SDK tree. From the mozilla source directory: | |||
hg addremove addon-sdk/source | |||
hg status -X addon-sdk/source # Should show no results | |||
hg status -ur addon-sdk/source # Should show no results | |||
hg status # Shows you all the changes you're about to land | |||
== Testing changes == | == Testing changes == | ||
| Line 50: | Line 59: | ||
Before committing you can test your changes by pushing to the try server. You need to have mercurial queues enabled for this to work. | 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 qnew -f -m "<commit message>" testpatch | hg qnew -f -m "<commit message>" testpatch | ||
| Line 61: | Line 69: | ||
Once you're done the following converts the temporary commit to a real commit that can be pushed to the project branch: | Once you're done the following converts the temporary commit to a real commit that can be pushed to the project branch: | ||
hg qrefresh -e # Edit the commit message to remove the try: syntax | |||
hg qfinish -a | hg qfinish -a | ||
== Viewing and committing changes == | == Viewing and committing changes == | ||
If you | If you aren't testing the changes on try then you can just commit them: | ||
hg commit | |||
== Pushing the changes to the project branch == | == Pushing the changes to the project branch == | ||