Differences

This shows you the differences between two versions of the page.

--- devel:backporting-to-3.2.x [2011/11/21 10:03] – [Backporting to branch 3.2] miconda
+++ devel:backporting-to-3.2.x [2011/11/21 10:11] (current) – [Recommendations] miconda
@@ Line 298: / Line 298: @@
 ...
+</code>
+<fc #0000FF>IMPORTANT: Again, before pushing commits to sip-router.org GIT repository in the stable branch, 3.2, be sure you have tested them properly and they don't break the code.</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:
+<code>
+cd ~/kamailio/kamailio-3.2
+git pull origin
+git cherry-pick -x a1b2c3d
+git push origin 3.2:3.2
 </code>
 ===== Remarks =====
-Note this is one way of doing the backporting, there are many other ways, consult GIT manual for alternatives.
+Note this is one way of doing the backporting, there are many other ways, consult GIT manual for alternatives. This is a wiki page -- people knowing alternatives to do porting of the patches from one branch to another are welcome to contribute.