> On May 28, 2014, 5 a.m., wdoekes wrote: > > /svnmerge, lines 990-991 > > <https://reviewboard.asterisk.org/r/3554/diff/1/?file=58769#file58769line990> > > > > Prepending '#' does not work. > > > > I still get mails that "FishEye was unable to execute the transition > > \"close\"". > > > > Perhaps prepending 'NOT-' or '-' or (as last ditch effort) infixing an > > extra hyphen (ASTERISK--1234) helps. > > > > Needs testing. (Hint!)
So I tested this out and got the following: #ASTERISK-23803 #close Reported by: zvision patches: manager.c.diff uploaded by zvision (License 5755) After commit, I didn't get any additional message; although, that could be because I made JIRA accept "Close" -> "Close" transitions yesterday. - Matt ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviewboard.asterisk.org/r/3554/#review11985 ----------------------------------------------------------- On May 23, 2014, 5:23 a.m., wdoekes wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviewboard.asterisk.org/r/3554/ > ----------------------------------------------------------- > > (Updated May 23, 2014, 5:23 a.m.) > > > Review request for Asterisk Developers and Matt Jordan. > > > 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 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.) > > > 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 > >
-- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
