Bugs often get fixed in master before release branches. When a bug is fixed in the master branch, it might be desirable or necessary in a stable branch. To put the fix in stable branch we need to backport the fix to stable branch.
Anyone in the community can suggest a backport. If you are interested to suggest a backport, please check the Backport Wishlist.
This page describes the steps needed to backport simple changes. Changes
that do not apply cleanly will need some manual modifications and using
git cherry-pick may not always be the easiest solution.
Git clone the GlusterFS code git clone ssh://email@example.com/glusterfs
Create and checkout a new branch for your work, based on the branch for the backport version
git checkout -t -b bug-123456/release-3.5 origin/release-3.5
Cherry pick the change from master.
$ git cherry-pick -x a0b1c2d3e4f5
verify that the change has been merged in the master branch.
Update/correct the commit message.
$ git commit -s --amend --date="$(date)"
make sure to quote the review tags
- update the BUG reference, point to the BUG that is used for this particular release-branch
add a Signed-off-by tag
./rfc.shto post the backport for review.
After submitting patch(es), make sure to move the bug to the POST status.