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
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@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Hello,
Thank you, in the end I used the diff-tree way.
Have a nice day, Lucian
On 13.04.2017 16:01, Daniel-Constantin Mierla wrote:
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@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Hello,
ok.
I saw you backported the commit to 4.4 branch, but not to 5.0, shouldn't be there as well?
Cheers, Daniel
On 13.04.17 15:54, Lucian Balaceanu wrote:
Hello,
Thank you, in the end I used the diff-tree way.
Have a nice day, Lucian
On 13.04.2017 16:01, Daniel-Constantin Mierla wrote:
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@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
-
Daniel-Constantin Mierla -
Lucian Balaceanu