Confirmed users
250
edits
Jetpack/Integration Process: Difference between revisions
Jump to navigation
Jump to search
adding a section on rebasing a single commit
(→Pushing the changes to the project branch: on backouts) |
(adding a section on rebasing a single commit) |
||
| Line 123: | Line 123: | ||
hg commit | 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 == | == Pushing the changes to the project branch == | ||