[SR-Users] append_branch and t_replicate issue

[Daniel-Constantin Mierla]

Hello,

On 25/07/14 12:36, Asgaroth wrote:
> Hi,
>
> Another quick question on the git checkout, do I need to checkout the 
> 4.1 branch for this patch, or is it in 4.2 branch?
>
> I did the following:
>
> git clone --depth 1 git://git.sip-router.org/sip-router kamailio
> make FLAVOUR=kamailio tar
>
> this generates the following tar file which I will use for building 
> the rpms:
>
> kamailio-4.2.0-dev7_src.tar.gz
>
> Is the patch living in this branch
yes, the patch is in the above sources tarball.

> or can I do a 'git checkout -b 4.1 origin/4.1' and expect the patch to 
> be in there?

No, the patch is not in branch 4.1. If you have the branch 4.1 cloned 
locally, you can use:

git pull origin
git cherry-pick -x c5b6b6021e75cd4e73f54f9131524b588709950c

to get the patch in branch 4.1, in your local copy of sources.

Cheers,
Daniel
>
> Thanks
> Bruce
>
> On 25/07/2014 11:20, Asgaroth wrote:
>> Hi,
>>
>> On 25/07/2014 11:03, Daniel-Constantin Mierla wrote:
>>> I pushed a patch to master branch that allows to use t_replicate() 
>>> without any parameters.
>>>
>>> Apparently the same behaviour can be achieved using:
>>>
>>> t_replicate("")
>>>
>>> so the parameter is an empty string. Can you try it and see if 
>>> works? Also, feedback on testing the patch for no parameter would be 
>>> appreciated. 
>>
>> Thanks for this patch, I'll get on to building a couple rpm's with 
>> master branch to test.
>>
>> Just to verify, you want me to test using the following setup:
>>
>> $ru = "sip:" + BACKUP_REGISTRAR_1 + ":5060";
>> append_branch("sip:" + BACKUP_REGISTRAR_2 + ":5060");
>> *t_replicate("");*
>>
>> and
>>
>> $ru = "sip:" + BACKUP_REGISTRAR_1 + ":5060";
>> append_branch("sip:" + BACKUP_REGISTRAR_2 + ":5060");
>> *t_replicate();*
>>
>> Thanks
>> Bruce
>

-- 
Daniel-Constantin Mierla - http://www.asipto.com
http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sip-router.org/pipermail/sr-users/attachments/20140725/f257b0cf/attachment.html>