I'm not having a great deal of success here.

I have checked out svn://svn.code.sf.net/p/oorexx/code-0/docs to
c:\ooRexxSVNDocs\ on my Windows laptop
Within that folder I can see the tree that matches what is in the top of
the patch
Following my instructions from TortoiseSVN 1.7 Beginners guide (admittedly
rather back-level, but it is what I have) I place the patch in the
[C:\ooRexxSVNDocs\trunk\rexxref\en-US] folder where the checked out
intro.xml resides
I right click on the patch and select TortoiseSVN \ Apply patch
As expected, the TortoiseMerge Window opens, but instead of showing me a
diff I get an error message
Path found that matches the patch better.
The path C:\oorexxSVNDocs\trunk\rexxref\en-us seems not to match the paths
in the patch-file.  But TortoiseMerge found the path C:\ooRexxSVNDocs
matches it better.  Do you want to use the suggested path instead?
Whichever option I choose, I just see an empty diff.

I then tried editing the patch so that it had the absolute windows path
instead of the path relative to main.  This time I got no error message,
but still an empty diff

I tried placing the diff file in c:\ooRexxDocsSVN - still an empty diff

after refering to
[https://stackoverflow.com/questions/11940172/tortoisesvn-apply-patch-error]
I tried editing the patch to remove the path from the Index line and the
--- and +++ lines.  Still an empty diff.

That's as far as I can get.  I'm passing this one back.

Jon



thanks,

Jon









On Thu, 23 Oct 2025 at 14:10, Rony G. Flatscher <[email protected]>
wrote:

> Dear P.O.,
>
> thank you for looking into this!
>
>
> On 23.10.2025 14:56, Sahananda wrote:
>
> It's a while since I used the SVN, but I just updated my working copy.
> I've never applied a patch, but I thought I would give it a try.
>
> My manual says
> Open the patch and look at the first line to determine where it was
> created from
>
> Patch #349 has this first line:
> *Index: trunk/rexxref/en-US/intro.xml*
>
> Josep Maria has probably checked out the entire doc subtree with all
> versions, such that he produced the patch from the "docs" directory sitting
> right above the "trunk" subdirectory. So if you change up into the "docs"
> directory and apply the patch from there should work.
>
>
> However, my working copy does not contain that branch.  Only these folders:
> 23/10/2025  13:34    <DIR>          api
> 23/10/2025  13:35    <DIR>          common
> 26/04/2023  12:13    <DIR>          extensions
> 26/04/2023  12:13    <DIR>          interpreter
> 26/04/2023  12:14    <DIR>          lib
> 26/04/2023  12:13    <DIR>          platform
> 26/04/2023  12:14    <DIR>          rexxapi
> 23/10/2025  13:35    <DIR>          samples
> 06/01/2024  15:50    <DIR>          sandbox
> 26/04/2023  12:13    <DIR>          support
> 23/10/2025  13:35    <DIR>          testbinaries
> 26/04/2023  12:14    <DIR>          utilities
>
> Which looks like I originally downloaded it from main\trunk
> So I'm guessing that I should have created my working copy from higher up
> the tree.
>
> Yes, probably the "docs" directory which includes the "trunk" subdirectory.
>
> However looking at the SVN on Sourceforge I cannot see where the branch
> that Josep Maria took these from is.
>
> Maybe he checked out the entire project with something like this:
>
> svn checkout svn://svn.code.sf.net/p/oorexx/code-0/docs oorexx_docs
>
> If someone can point me to it, I might be able to rebuild my working copy,
> but it might be quicker if someone set up and with more experience took
> this on.
>
> HTH
>
> ---rony
>
> _______________________________________________
> 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

Reply via email to