<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/1556/">https://reviewboard.asterisk.org/r/1556/</a>
</td>
</tr>
</table>
<br />
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Alright, awesome news, due to John's patch happening around the same areas as yours, this patch no longer merges cleanly into the source.
root@JonUbuntu:~/AsteriskWorkspace/menuselectMoreDumb/trunk/menuselect# patch -p0 < ../barrier.patch
patching file menuselect_curses.c
Hunk #1 FAILED at 565.
Hunk #2 succeeded at 576 (offset 1 line).
Hunk #3 succeeded at 592 (offset 3 lines).
Hunk #4 succeeded at 640 (offset 3 lines).
Hunk #5 FAILED at 669.
Hunk #6 succeeded at 754 (offset 5 lines).
Hunk #7 succeeded at 796 (offset 5 lines).
Hunk #8 succeeded at 819 (offset 5 lines).
Hunk #9 FAILED at 853.
Hunk #10 FAILED at 892.
Hunk #11 succeeded at 951 (offset 42 lines).
4 out of 11 hunks FAILED -- saving rejects to file menuselect_curses.c.rej
Basically this sort of thing happens when code has changed to the point where the patching program can't find the pattern your changes were made from.
In order to fix this, you'll want to update to the latest menuselect and then you'll want to apply the patch as is and look at the conflicts and make your best judgement on how to resolve them. In most cases, it probably won't be too difficult to just find out where a line was added or removed and you can just delete the failed patch indications and maybe have to move your code around a little. Other times it can be a little more tricky, but I don't think that's going to be an issue here.
Once you fix this patch, post the new version to the issue and we'll resubmit it for review, and we'll probably just be able to put it in at that point.</pre>
<br />
<p>- jrose</p>
<br />
<p>On November 2nd, 2011, 1:26 p.m., jrose wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('https://reviewboard.asterisk.org/media/rb/images/review_request_box_top_bg.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Asterisk Developers, David Vossel and jrose.</div>
<div>By jrose.</div>
<p style="color: grey;"><i>Updated Nov. 2, 2011, 1:26 p.m.</i></p>
<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;">Adds barriers to the cmenuselect easteregg. They absorb shots, but fall apart quickly. Also has support for different amounts of health on barriers, but this is currently set to one shot, one barrier killed.
Submitted by proxy for J'Len Dowdy.</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;">Played through the easteregg a number of times to make sure it didn't explode under normal use conditions.</pre>
</td>
</tr>
</table>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Bugs: </b>
<a href="https://issues.asterisk.org/jira/browse/ASTERISK-18802">ASTERISK-18802</a>
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>/trunk/menuselect_curses.c <span style="color: grey">(953)</span></li>
</ul>
<p><a href="https://reviewboard.asterisk.org/r/1556/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>