Project

General

Profile

HOWTO keep backporting while the release branch is frozen » History » Version 1

Loïc Dachary, 11/09/2016 12:39 PM

1 1 Loïc Dachary
After tests starts for the the release branch (jewel, hammer etc.), no backport should be merged to it because the release process can only run on the tip of the branch. To workaround that limitation and keep merging backports while the tests happen (which may last from one week to three weeks), the backports are merged into the *release*-next branch instead (i.e. jewel-next, hammer-next etc.).
2
3
* For all pull request targeting the frozen branch, using the web interface, edit the label and using the menu to switch from *release* to *release*-next (i.e. jewel to jewel-next etc.)
4
* After the release is published, rebase *release*-next on top of *release* and push *release*-next to *release*. The rebase should only be necessary in case a backported was needed after the freeze (which can happen if testing reveals a problem).