How to create a patch from the diff between two patches

Question

I have made modifications in my local SVN working copy, created a patch, and submitted that patch to the repository maintainer.

The repository maintainer merged that patch in, but my access to that server is down for another week (my VPN token expired and getting a new one will take some time) so until it's back up again I can't update my working copy.

In the meantime, I've made further modifications to my local working directory and have created a second patch.

How can I get the difference between the two patches as a .patch file to send the repo maintainer to apply my latest changes?

Alternatively, is there a way I can apply an SVN update to my local repo in an offline state (e.g. files emailed to me).

Note: I'm on Windows, using TortoiseSVN but will try any tools that get me to where I need to be.

Answer 1

If you have access to Linux (even using WSL), you can simply create another patch and then use the interdiff command which shows differences between two diff files.

interdiff patch1 patch2

In Ubuntu, interdiff can be installed using:

sudo apt install patchutils