canmove, Confirmed users
1,570
edits
Jetpack/Integration Process: Difference between revisions
→Performing the uplift
No edit summary |
|||
| Line 15: | Line 15: | ||
= Performing the uplift = | = Performing the uplift = | ||
== Check for changes requiring uplift to git == | |||
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. | |||
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. | |||
== Updating the version branches == | == Updating the version branches == | ||