[asterisk-dev] [svn-commits] transnexus: branch 1.8 r338137 - /branches/1.8/apps/app_osplookup.c

[Di-Shi Sun]

Hi Paul,

Would you please show me the commands to remove the changes in branch 1.8? I 
am not good at this part.

We will take care the configure.ac issue.

Another question, which branches are not feature freeze? We should apply the 
changes to them.

Thanks,

Di-Shi Sun.


----- Original Message ----- 
From: "Paul Belanger" <pabelanger at digium.com>
To: "Di-Shi Sun" <di-shi at transnexus.com>
Cc: <support at transnexus.com>; "Asterisk Developers" 
<asterisk-dev at lists.digium.com>
Sent: Thursday, September 29, 2011 11:53 PM
Subject: Re: [svn-commits] transnexus: branch 1.8 r338137 - 
/branches/1.8/apps/app_osplookup.c


> On 11-09-28 09:38 PM, Di-Shi Sun wrote:
>> Hi Paul,
>>
>> Thank you for review the modification. These chages mainly are a bug
>> fix. The osplookup application in branch 1.8, also in trunk, cannot be
>> compiled with OSP Toolkit 4.0.0 and later versions. If it is possible,
>> we would prefer applying it in branch 1.8. Please let me know if we
>> should remove the changes from branch 1.8 and use the SVN tools you
>> mentioned to merge them from trunk.
>>
>> For configure.ac, I do not understand how to do. Do you mean except
>> committing configure.ac iteself, we should run bootstrap.sh and commit
>> the result "configure" file too?
>>
>> Thanks,
>>
>> Di-Shi Sun.
>>
> Yes, you'll need to remove the code from 1.8, since new features cannot be 
> merged into it.
>
> And yes, after you run bootstrap.sh, you will need to commit all files it 
> touches. The configure binary will be changed, and needs to be committed 
> too.
>
> -- 
> Paul Belanger
> Digium, Inc. | Software Developer
> twitter: pabelanger | IRC: pabelanger (Freenode)
> Check us out at: http://digium.com & http://asterisk.org
>