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

[rmudgett]

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



/svnmerge
<https://reviewboard.asterisk.org/r/1451/#comment8554>

    Why this change?



/svnmerge
<https://reviewboard.asterisk.org/r/1451/#comment8553>

    I think a recorded merge commit should have the recorded revisions line first since the actual change should already have been merged by another commit.
    
    if record_only
       record merge summary line
       blank line
       recorded revision commit message
    else
       original commit message
       log separator
       merged revisions from
       



/svnmerge
<https://reviewboard.asterisk.org/r/1451/#comment8551>

    Undo this.  A blank line is supposed to separate the summary line from the message body.



/svnmerge
<https://reviewboard.asterisk.org/r/1451/#comment8552>

    Undo this.  A blank line is supposed to separate the summary line from the message body.


- rmudgett


On Sept. 21, 2011, 6:38 p.m., Tilghman Lesher wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviewboard.asterisk.org/r/1451/
> -----------------------------------------------------------
> 
> (Updated Sept. 21, 2011, 6:38 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.
> 
> 
> Diffs
> -----
> 
>   /svnmerge 795 
> 
> Diff: https://reviewboard.asterisk.org/r/1451/diff
> 
> 
> Testing
> -------
> 
> Currently, an example message is as follows (after 2 merges):
> 
> -----start message-----
> 
> 
> More silly spacing changes
> 
> .....
> Merged revisions 337353 from http://svn.asterisk.org/svn/asterisk/branches/1.8
> 
> .....
> Merged revisions 337380 from http://svn.asterisk.org/svn/asterisk/branches/10
> -----end message-----
> 
> 
> Thanks,
> 
> Tilghman
> 
>

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