Jetpack/Integration Process: Difference between revisions

Jetpack/Integration Process (view source)

1,154 bytes added , 23 January 2015

→‎Checking changes: mention build files which need to be updated.

Confirmed users

250

edits

@@ Line 72: / Line 72: @@
   hg status -ur addon-sdk/source # Should show no results
   hg status # Shows you all the changes you're about to land
+=== addon-sdk/moz.build ===
+Make sure that the addon-sdk/moz.build file is correct, you can use this script to update it:
+ ./mach generate-addon-sdk-moz-build
+This is not a perfect script though, it may have bugs so if you notice something file something.
+=== addon-sdk/source/test/jetpack-package.ini ===
+There is no script to update this at the moment, this is bug 1119600, so updates must be done by hand.
+=== addon-sdk/source/test/addons/jetpack-package.ini ===
+There is no script to update this at the moment, this is bug 1119601, so updates must be done by hand.
 == Testing changes ==
@@ Line 123: / Line 139: @@
   hg commit
+== Reverting a local commit ==
+If you made a commit, and the tree you want to push to updates before you are able to push, then you need to revert your local commit and save it as a patch, update your local branch, and then put your patch back on top.  This is basically a git rebase.
+ hg qimport -r tip
+ hg qpop
+ hg pull -u
+ hg qpush testpatch
+Now you'll have a queue with one patch, which is the patch you are rebasing.
+Finalize the patch when you are ready, before doing this though you may which you push to try again..
+ hg qfin -a
+Now you have a real commit again.
 == Pushing the changes to the project branch ==