This shows you the differences between two versions of the page.
Next revision | Previous revision | ||
devel:backporting-to-3.2.x [2011/11/21 10:13] miconda created |
devel:backporting-to-3.2.x [2011/11/21 11:11] miconda [Recommendations] |
||
---|---|---|---|
Line 283: | Line 283: | ||
</ | </ | ||
- | You should see the commit announcement on the sr-dev mailing list in short time. | + | You should see the email with the commit announcement on the sr-dev mailing list in short time. |
+ | < | ||
+ | [sr-dev] git:3.2: kamailio.cfg: | ||
+ | |||
+ | Module: sip-router | ||
+ | Branch: 3.2 | ||
+ | Commit: a1b2c3dab799a003b1097b2a1ca08a7b5ebc9390 | ||
+ | URL: http:// | ||
+ | |||
+ | ... | ||
+ | |||
+ | (cherry picked from commit f3fb55dab799a003b1097b2a1ca08a7b5ebc9390) | ||
+ | |||
+ | ... | ||
+ | </ | ||
+ | |||
+ | <fc # | ||
+ | ===== Recommendations ===== | ||
+ | |||
+ | Use cherry-pick whenever it is possible, especially when fixing issues. The commit to stable branch will have a reference to the commit in the master branch, making easier to track if any fix has been forgotten to be ported. | ||
+ | |||
+ | For quick reference, when you are in local branch 3.2 and want to backport commit with id a1b2c3d, here is the sequence of commands: | ||
+ | |||
+ | < | ||
+ | cd ~/ | ||
+ | git pull origin | ||
+ | git cherry-pick -x a1b2c3d | ||
+ | git push origin 3.2:3.2 | ||
+ | </ | ||
===== Remarks ===== | ===== Remarks ===== | ||
- | Note this is one way of doing the backporting, | + | Note this is one way of doing the backporting, |