[asterisk-dev] [Code Review] 3554: repotools: Get rid of duplicate JIRA-1234 #comments

[wdoekes]

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

Review request for Asterisk Developers.


Repository: Repotools


Description
-------

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 prepends a pound (#) to the ISSUE_KEY so that it is (hopefully) not picked
up by JIRA and we only get a single commit from the primary commit.

(Also began to run the flake8 checker on svnmerge, but that turned out to be a bad
idea.)


Diffs
-----

  /svnmerge 877 

Diff: https://reviewboard.asterisk.org/r/3554/diff/


Testing
-------

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


Thanks,

wdoekes

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-dev/attachments/20140522/64bd1e8d/attachment.html>