<div dir="ltr">I intend on maintaining 1.7 up you're ready to release and branch 1.8.<div><br></div><div>As others have noted, I've tried to apply this patch to the 1.7 series branch but the patch does not apply. One hunk applies with fuzz 2, the other does not apply. Jaak - any chance of getting a patch that applies?</div>
<div><br></div><div>--Greg</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Sat, Jul 12, 2014 at 9:09 PM, Troy A. Griffitts <span dir="ltr"><<a href="mailto:scribe@crosswire.org" target="_blank">scribe@crosswire.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Isaac, Thanks for checking and confirming that trunk has been fixed.<br>
<br>
Greg, It seems quite reasonable to applying Jaak's patch to the 1.7 branch if we intend on releasing a 1.7.4. I mention this, as this is an exception to the rule that all patches are first applied to trunk and then merged to release.<br>
<br>
Thanks again Jaak and Isaac (and Greg for maintaining the 1.7 branch).<span class="HOEnZb"><font color="#888888"><br>
<br>
Troy</font></span><div class="HOEnZb"><div class="h5"><br>
<br>
<br>
<br>
On 07/12/2014 02:21 PM, Isaac Dunham wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
On Sat, Jul 12, 2014 at 10:59:19AM -0700, Troy A. Griffitts wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Dear Jaak,<br>
<br>
Thank you so much for looking into this. I went to review your patch and it<br>
doesn't apply cleanly to trunk. Have you confirmed that this problem still<br>
exists in trunk? If so, might you consider sending a patch against trunk?<br>
Thank you!<br>
<br>
Troy<br>
<br>
On 07/10/2014 01:34 AM, Jaak Ristioja wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
This seems to be a really silly indentation error in Sword 1.7.3. At<br>
least the attached patch fixed the problem in my Alpine Linux VM for<br>
"diatheke -b KJV -k Ps117". Might already be fixed in SVN.<br>
<br>
Can any Sword developers confirm this bug and fix?<br>
<br>
Blessings!<br>
Jaak<br>
</blockquote></blockquote>
Just built sword from the mirror at <a href="http://gitorious.org/sword/sword" target="_blank">gitorious.org/sword/sword</a>;<br>
the bug is fixed there.<br>
(For reference: I see that diatheke -f plain is now needed to get<br>
plain output, since -f internal is now the default.)<br>
<br>
God bless,<br>
Isaac Dunham<br>
<br>
<br>
______________________________<u></u>_________________<br>
sword-devel mailing list: <a href="mailto:sword-devel@crosswire.org" target="_blank">sword-devel@crosswire.org</a><br>
<a href="http://www.crosswire.org/mailman/listinfo/sword-devel" target="_blank">http://www.crosswire.org/<u></u>mailman/listinfo/sword-devel</a><br>
Instructions to unsubscribe/change your settings at above page<br>
</blockquote>
<br>
<br>
______________________________<u></u>_________________<br>
sword-devel mailing list: <a href="mailto:sword-devel@crosswire.org" target="_blank">sword-devel@crosswire.org</a><br>
<a href="http://www.crosswire.org/mailman/listinfo/sword-devel" target="_blank">http://www.crosswire.org/<u></u>mailman/listinfo/sword-devel</a><br>
Instructions to unsubscribe/change your settings at above page<br>
</div></div></blockquote></div><br></div>