[asterisk-dev] [svn-commits] schmidts: trunk r334683 - /trunk/main/features.c

[Paul Belanger]

On 11-09-07 09:31 AM, SVN commits to the Digium repositories wrote:
> Author: schmidts
> Date: Wed Sep  7 08:31:13 2011
> New Revision: 334683
>
> URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=334683
> Log:
> Adding the Feature to sent a Reason Header in a SIP Cancel message by set the flag AST_FLAG_ANSWERED_ELSEWHERE before doing a masquerade in the pickup function.
>
>
> Modified:
>      trunk/main/features.c
>
> Modified: trunk/main/features.c
> URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=334683&r1=334682&r2=334683
> ==============================================================================
> --- trunk/main/features.c (original)
> +++ trunk/main/features.c Wed Sep  7 08:31:13 2011
> @@ -7063,6 +7063,9 @@
>   		ast_log(LOG_WARNING, "Unable to queue answer on '%s'\n", chan_name);
>   		goto pickup_failed;
>   	}
> +	
> +	/* setting this flag to generate a reason header in the cancel message to the ringing channel */
> +	ast_set_flag(chan, AST_FLAG_ANSWERED_ELSEWHERE);
>
>   	if (ast_channel_masquerade(target, chan)) {
>   		ast_log(LOG_WARNING, "Unable to masquerade '%s' into '%s'\n", chan_name,
>
This merge does not look correct, did you use the svnmerge script?  You 
should have used:

$ cd ~/svn/asterisk/trunk
$ merge10trunk 334682
$ svn commit -F ../merge.msg

You can revert this commit, using:

$ svn merge -c -334683 .

and try again.

-- 
Paul Belanger
Digium, Inc. | Software Developer
twitter: pabelanger | IRC: pabelanger (Freenode)
Check us out at: http://digium.com & http://asterisk.org