<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://reviewboard.asterisk.org/r/3554/">https://reviewboard.asterisk.org/r/3554/</a>
</td>
</tr>
</table>
<br />
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('https://reviewboard.asterisk.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Asterisk Developers and Matt Jordan.</div>
<div>By wdoekes.</div>
<p style="color: grey;"><i>Updated May 23, 2014, 10:23 a.m.</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Changes</h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Added mjordan to the recipients.</pre>
</td>
</tr>
</table>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
Repotools
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">When merging across branches, the commit message is duplicated using the mergeXY
command.
Unfortunately, when using the new JIRA-style ASTERISK-1234 #comments, this comment
is now reported as many times as the merges are done.
See for example the last 4 comments of:
https://issues.asterisk.org/jira/browse/ASTERISK-23650
This patch prepends a pound (#) to the ISSUE_KEY so that it is (hopefully) not picked
up a second time by JIRA and we only get a single comment from the primary commit.
(Also began to run the flake8 checker on svnmerge, but that turned out to be a bad
idea.)</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">asterisk-11.x-WRITE$ svn log -r 414214 ../asterisk-1.8.x-WRITE/
------------------------------------------------------------------------
r414214 | sgriepentrog | 2014-05-21 20:58:47 +0200 (wo, 21 mei 2014) | 13 lines
pbx.c: prevent potential crash from recursive replace()
Recurisve [sic] usage of replace() resulted in corruption of the
temporary string storage and potential crash. By changing
the string to be allocated separtely per instance, this is
eliminated.
ASTERISK-23650 #comment Reported by: Roel van Meer
ASTERISK-23650 #close
Review: https://reviewboard.asterisk.org/r/3539/
------------------------------------------------------------------------
asterisk-11.x-WRITE$ svn up -r 414214
...
asterisk-11.x-WRITE$ merge811 414214
...
asterisk-11.x-WRITE$ cat ../merge.msg
pbx.c: prevent potential crash from recursive replace()
Recurisve [sic] usage of replace() resulted in corruption of the
temporary string storage and potential crash. By changing
the string to be allocated separtely per instance, this is
eliminated.
#ASTERISK-23650 #comment Reported by: Roel van Meer
#ASTERISK-23650 #close
Review: https://reviewboard.asterisk.org/r/3539/
........
Merged revisions 414214 from http://svn.asterisk.org/svn/asterisk/branches/1.8
</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>/svnmerge <span style="color: grey">(877)</span></li>
</ul>
<p><a href="https://reviewboard.asterisk.org/r/3554/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>