User Tools

Site Tools


devel:backporting-to-3.2.x

Differences

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

Link to this comparison view

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] (current)
miconda [Recommendations]
Line 283: Line 283:
 </code> </code>
  
-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.
  
 +<code>
 +[sr-dev] git:3.2: kamailio.cfg: small change to make an example
 +
 +Module: sip-router
 +Branch: 3.2
 +Commit: a1b2c3dab799a003b1097b2a1ca08a7b5ebc9390
 +URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a1b2c3dab799a003b1097b2a1ca08a7b5ebc9390
 +
 +...
 +
 +(cherry picked from commit f3fb55dab799a003b1097b2a1ca08a7b5ebc9390)
 +
 +...
 +</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 ===== ===== 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.
  
devel/backporting-to-3.2.x.1321866782.txt.gz ยท Last modified: 2011/11/21 10:13 by miconda