[asterisk-dev] [Code Review] Modify merge message so commit log message comes first. (Another version)

Paul Belanger reviewboard at asterisk.org
Thu Oct 6 09:41:13 CDT 2011


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/1477/#review4486
-----------------------------------------------------------


Tried this out a little yesterday, didn't see anything wrong with it. Would be nice to get more feedback about the actually format of the message.

- Paul


On Oct. 3, 2011, 12:35 p.m., rmudgett wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviewboard.asterisk.org/r/1477/
> -----------------------------------------------------------
> 
> (Updated Oct. 3, 2011, 12:35 p.m.)
> 
> 
> Review request for Asterisk Developers.
> 
> 
> Summary
> -------
> 
> Some discussion was made several weeks ago about modifying the svnmerge log message, such that the committer's log message comes first in any merge, followed by details on where the commit was originally made.  This improves our overall log messages.  Also, the URL is modified in the message as to show the public path, instead of the commit path, which is not available to most.
> 
> This is based on Tilghman's version from
> https://reviewboard.asterisk.org/r/1451/
> 
> Single version merges do not start with blank lines.
> Handles multiple version merges.
> 
> 
> Diffs
> -----
> 
>   /svnmerge 799 
> 
> Diff: https://reviewboard.asterisk.org/r/1477/diff
> 
> 
> Testing
> -------
> 
> -- start message for single revision merged twice
> Fix formatting of AMI header for SIP show peer.
> 
> ASTERISK-17486 exposed the problem for AMI parsers.
> 
> (closes issue ASTERISK-18649)
> Reported by: Jacek Konieczny
> Patches:
>       asterisk-sipshowpeer_response_end.patch (license #6298) patch uploaded by Jacek Konieczny
> ........
> 
> Merged revisions 338663 from http://svn.asterisk.org/svn/asterisk/branches/1.8
> ........
> 
> Merged revisions 338664 from http://svn.asterisk.org/svn/asterisk/branches/10
> -- end message
> 
> -- start message for multiple merged revisions
> Multiple revisions 335717,336504,337120
> 
> ........
>   r335717 | tzafrir | 2011-09-13 16:37:58 -0500 (Tue, 13 Sep 2011) | 9 lines
> 
>   do parse defaultlanguage from asterisk.conf
> 
>   Do parse the option "defaultlanguage" from the [options] section of
>   asterisk.conf, as in the sample config file. Otherwise the build-time
>   default language (normally "en") is always the default one.
> 
>   Review: https://reviewboard.asterisk.org/r/1342/
>   Signed-off-by: Tzafrir Cohen (License #5035) <tzafrir.cohen at xorcom.com>
>   Original-Commit: http://svn.digium.com/svn/asterisk/branches/1.8@335716
> ........
>   r336504 | oej | 2011-09-19 08:48:48 -0500 (Mon, 19 Sep 2011) | 2 lines
> 
>   Revert accidental change
> ........
>   r337120 | mjordan | 2011-09-20 17:49:36 -0500 (Tue, 20 Sep 2011) | 28 lines
> 
>   Merged revisions 337118 via svnmerge from
>   https://origsvn.digium.com/svn/asterisk/branches/1.8
> 
>   ........
>     r337118 | mjordan | 2011-09-20 17:38:54 -0500 (Tue, 20 Sep 2011) | 21 lines
> 
>     Fix for incorrect voicemail duration in external notifications
> 
>     This patch fixes an issue where the voicemail duration was being reported
>     with a duration significantly less than the actual sound file duration.
>     Voicemails that contained mostly silence were reporting the duration of
>     only the sound in the file, as opposed to the duration of the file with
>     the silence.  This patch fixes this by having two durations reported in
>     the __ast_play_and_record family of functions - the sound_duration and the
>     actual duration of the file.  The sound_duration, which is optional, now
>     reports the duration of the sound in the file, while the actual full duration
>     of the file is reported in the duration parameter.  This allows the voicemail
>     applications to use the sound_duration for minimum duration checking, while
>     reporting the full duration to external parties if the voicemail is kept.
> 
>     (issue ASTERISK-2234)
>     (closes issue ASTERISK-16981)
>     Reported by: Mary Ciuciu, Byron Clark, Brad House, Karsten Wemheuer, KevinH
>     Tested by: Matt Jordan
> 
>     Review: https://reviewboard.asterisk.org/r/1443
>   ........
> ........
> 
> Merged revisions 335717,336504,337120 from http://svn.asterisk.org/svn/asterisk/branches/10
> -- end message
> 
> 
> Thanks,
> 
> rmudgett
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-dev/attachments/20111006/b7003d96/attachment.htm>


More information about the asterisk-dev mailing list