Jump to content

Problem with applying a patch.diff due to path problem (Windows 11 and TortoiseSVN)


Recommended Posts

Hello!

After I did a fresh svn co https://svn.wildfiregames.com/public/ps/trunk/ 0ad-svn (well, not with the CLI/console but with the TortoiseSVN GUI context menu on Windows 11), I wanted to apply a patch.diff file. However, the patch contains a path starting with "ps/trunk/binaries" (attached; kindly provided by @wowgetoffyourcellphone for his new colouring scheme, which I wanted to try - see separate thread), whereas on my laptop, the path of the svn repo is different and therefore, the patch cannot be applied (at least I don't know how):

image.png.ed43ca61ac75f8c8d267ca0c8a7152a6.png

Should I manually change the path in patch.diff, or should I try something else? The content of his patch should not be discussed here. This is only about my technical question about the correct application of a patch in general. Thanks to all of you for your help! :)

D4811.diff

Link to comment
Share on other sites

40 minutes ago, Ceres said:

Hello!

After I did a fresh svn co https://svn.wildfiregames.com/public/ps/trunk/ 0ad-svn (well, not with the CLI/console but with the TortoiseSVN GUI context menu on Windows 11), I wanted to apply a patch.diff file. However, the patch contains a path starting with "ps/trunk/binaries" (attached; kindly provided by @wowgetoffyourcellphone for his new colouring scheme, which I wanted to try - see separate thread), whereas on my laptop, the path of the svn repo is different and therefore, the patch cannot be applied (at least I don't know how):

image.png.ed43ca61ac75f8c8d267ca0c8a7152a6.png

Should I manually change the path in patch.diff, or should I try something else? The content of his patch should not be discussed here. This is only about my technical question about the correct application of a patch in general. Thanks to all of you for your help! :)

D4811.diff 1 kB · 0 downloads

Wrong patch. :) 

You wanted this https://code.wildfiregames.com/D4813

Not sure if it will make a difference for you.

  • Thanks 1
Link to comment
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now
 Share

×
×
  • Create New...