13 Apr
2017
13 Apr
'17
4:01 p.m.
Hello,
in most of the cases it worked with 'cherry-pick -x' for me, latest git
versions seems to be smart and figure out the path change.
Otherwise I just get the patch as a diff from the commit with `git
diff-tree -p COMMITID` and apply it manually with 'patch'.
If there are better ways, I am keen to learn about as well.
Cheers,
Daniel
On 13.04.17 14:54, Lucian Balaceanu wrote:
Hi guys,
I would like to port my latest master commit to the 4.4 branch.
Since the path to the modules have changed I can no longer do a simple
`git cherry-pick -x ...`.
What is the accepted way to backport changes to 4.4? Maybe something
using the `git cherry-pick --strategy ...` ?
Thank you,
Lucian
_______________________________________________
Kamailio (SER) - Development Mailing List
sr-dev(a)lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
--
Daniel-Constantin Mierla
www.twitter.com/miconda -- www.linkedin.com/in/miconda
Kamailio Advanced Training - May 22-24 (USA) - www.asipto.com
Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com