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

[Di-Shi Sun]

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.

----- Original Message ----- 
From: "Paul Belanger" <pabelanger at digium.com>
To: <support at transnexus.com>
Cc: "Asterisk Developers" <asterisk-dev at lists.digium.com>
Sent: Wednesday, September 28, 2011 10:08 PM
Subject: Re: [svn-commits] transnexus: branch 1.8 r338137 - 
/branches/1.8/apps/app_osplookup.c


> On 11-09-28 03:27 AM, SVN commits to the Digium repositories wrote:
>> Author: transnexus
>> Date: Wed Sep 28 02:27:07 2011
>> New Revision: 338137
>>
>> URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=338137
>> Log:
>> Updated for OSP Toolkit 4.0.0.
>>
>> Modified:
>>      branches/1.8/apps/app_osplookup.c
>>
> Greetings,
>
> It looks like you have committed some new features to Asterisk trunk, 
> thanks.  However, they should not be merged into Asterisk 1.8, once a 
> branch have been released new features should not be added.
>
> Also, changes to configure.ac will require you to run the bootstrap.sh 
> file located in the source directory.
>
> If you do need to merge between branches, we have some svnmerge scripts in 
> repotools[1] that needs to be used.  For more info, check out the wiki 
> page[2].
>
> Feel free to jump on #asterisk-dev (Freenode) if you need anymore help or 
> questions.
>
> [1] http://svn.asterisk.org/svn/repotools
> [2] https://wiki.asterisk.org/wiki/display/AST/Subversion+Usage
>
> -- 
> Paul Belanger
> Digium, Inc. | Software Developer
> twitter: pabelanger | IRC: pabelanger (Freenode)
> Check us out at: http://digium.com & http://asterisk.org
>