I would also be interested in an answer to this. I tried creating a patch locally and noted these differences from Josep Maria's patch.
The file references did not have paths. My Working copy was at revision 13031 whilst Josep Maria's was at 13026 I also note that Josep Maria's patch which contained directory information used '/' as the path separator. Jon My Header > Index: intro.xml > =================================================================== > --- intro.xml (revision 13031) > +++ intro.xml (working copy) Josep Maria's Header > Index: trunk/rexxref/en-US/intro.xml > =================================================================== > --- trunk/rexxref/en-US/intro.xml (revision 13026) > +++ trunk/rexxref/en-US/intro.xml (working copy) On Fri, 24 Oct 2025 at 08:15, ooRexx <[email protected]> wrote: > 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 >
_______________________________________________ Oorexx-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/oorexx-devel
