canmove, Confirmed users
1,570
edits
Jetpack/Integration Process: Difference between revisions
→Check for changes requiring uplift to git
| Line 20: | Line 20: | ||
Sometimes SDK code is changed directly in mercurial. We have to make sure we aren't clobbering those when we uplift. | Sometimes SDK code is changed directly in mercurial. We have to make sure we aren't clobbering those when we uplift. | ||
Look at http://hgchanges.fractalbrew.com/fx-team/file/addon-sdk/source and see if there are any non-uplift changesets listed since the last uplift. | # Look at http://hgchanges.fractalbrew.com/fx-team/file/addon-sdk/source and see if there are any non-uplift changesets listed since the last uplift. | ||
If there are check if they have been uplifted to git yet, there will normally be a comment in the bug from the githubbot. | # If there are check if they have been uplifted to git yet, there will normally be a comment in the bug from the githubbot. | ||
If not you need to land the SDK part of that changes into master before doing anything else. Make sure to copy the commit message and author from the original mercurial patch. | # If not you need to land the SDK part of that changes into master before doing anything else. Make sure to copy the commit message and author from the original mercurial patch. | ||
== Updating the version branches == | == Updating the version branches == | ||