Clever Geek Handbook

Blank diff window with Apply Patch in TortoiseSVN

Steps:

  • From the TortoiseSVN context menu select "Create Patch"
  • On the other machine, do the same, but select Apply Patch and select the file generated in step 1.
  • An empty merge window opens.

It looks like this:

Screenshot

The patch file is valid and I can use the unix patch to apply it successfully (with some line break).

I'm on Windows 10 and TortoiseSVN / TortoiseMerge 1.9.5

+3


source to share


2 answers


The problem was that TortoiseMerge was being maximized. There is a floating window on the left.

Unprofile the TortoiseMerge window and you will see a file selection window. You can select files in this window to see them on the diff screen, and there are buttons to apply the patch.



It should look like this:

Screenshot

+5


source


I had the same problem and had to choose TortoiseMerge for Settings > Diff Viewer > Merge Tool.



I previously set up an external editor here and then it didn't show this patch window, just an empty merge tool. This feature may not work well with external editors.

0


source






More articles:


All Articles