Dear all, I wanted to apply the patches proposed by Josep Maria but failed miserably to do so. I have now applied the changes indicated in doc_bug_326.diff manually and that worked so there is nothing wrong with my SVN. I nevertheless would like to know why the patch did not work. Here is what I did:
% cd /Users/jenkins/ooRexxSVN-Code-0/docs/trunk/rexxref/en-US % svn update Aktualisiere ».«: Revision 13031. % svn patch /Users/jenkins/Downloads/doc_bug_326.diff C trunk/rexxref/en-US/instrc.xml > Abschnitt @@ -2081,9 +2081,8 @@ zurückgewiesen Konfliktübersicht: Textkonflikte: 1 What am I doing wrong? Is the patch not in the correct form? Or do I have to perform the patches in a specific order? I am on r13031 and the patch was made at r13026, does that make a difference? Here the rejection grounds --- trunk/rexxref/en-US/instrc.xml +++ trunk/rexxref/en-US/instrc.xml @@ -2081,9 +2081,8 @@ in this case must be either <computeroutput>SCIENTIFIC</computeroutput> or <computeroutput>ENGINEERING</computeroutput>. You can omit the subkeyword VALUE if <emphasis role="italic">expression2</emphasis> does not begin with a -symbol or a literal string, -that is, if it starts with a special character, such as an operator character -or parenthesis.</para> +symbol, that is, if it starts with a string or a special character, +such as an operator character or parenthesis.</para> <para>You can retrieve the current NUMERIC FORM setting with the <xref linkend="bifForm" xrefstyle="select:title"/> built-in function. </para> Hälsningar/Regards/Grüsse, ooRexx [email protected]
_______________________________________________ Oorexx-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/oorexx-devel
