<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Lucida Console'; font-size:9pt; font-weight:400; font-style:normal;">On Samstag, 10. Oktober 2009, Andrei Pelinescu-Onciul wrote:<br>
> If by mistake a sr_3.0 relevant fix is committed first to another branch,<br>
> git cherry-pick -x can (and should) be used to backport it.<br>
> E.g.:<br>
> git checkout sr_3.0<br>
> git cherry-pick -x <fix_commit_id><br>
> git pull origin sr_3.0:sr_3.0<br>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><br></p>Hi Andrei,<br>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><br></p>i'Ve tried today to cherry-pick some changes from master to the sr_3.0 branch. Here is what i did:<br>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><br></p>henning@ca:~/sip-router$ git checkout --track -b marius-tmp origin/sr_3.0<br>
Branch marius-tmp set up to track remote branch refs/remotes/origin/sr_3.0.<br>
Switched to a new branch "marius-tmp"<br>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><br></p>henning@ca:~/sip-router$ git cherry-pick -x e06a69d625d4c1293fceef13f9eca22e14662f9f<br>
Auto-merged modules/carrierroute/cr_func.c <br>
Finished one cherry-pick.<br>
Created commit 084ad8a: If the user parameter is "<null>" (e.g a empty username in the request URI), do not copy this value to the rewritten uri.<br>
1 files changed, 21 insertions(+), 10 deletions(-) <br>
[some more cherry picks..]<br>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><br></p>henning@ca:~/sip-router$ git log<br>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><br></p>Shows the correct changes<br>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><br></p>henning@ca:~/sip-router$ git status<br>
# On branch marius-tmp<br>
# Your branch is ahead of 'origin/sr_3.0' by 11 commits.<br>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><br></p>Also fine.<br>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><br></p>According to the tutorial i found i need now to push this, but i'm not sure if the command really does the right thing:<br>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><br></p>henning@ca:~/sip-router$ git push origin marius-tmp --dry-run<br>
To ssh://henning@git.sip-router.org/sip-router<br>
* [new branch] marius-tmp -> marius-tmp<br>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><br></p>It seems that it want to create a new remote branch, which is not really what i want..<br>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><br></p>Best regards,<br>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><br></p>Henning</p></body></html>