Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Empty diff window with Apply Patch in TortoiseSVN

Steps:

  1. Use TortoiseSVN's context menu to select "Create Patch"
  2. On another machine do the same but select "Apply Patch" and select the file generated in step 1.
  3. A blank merge window is opened.

It looks like this:

Screenshot

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

I'm on Windows 10 and TortoiseSVN/TortoiseMerge 1.9.5

like image 866
idbrii Avatar asked Jun 13 '17 18:06

idbrii


People also ask

How to Apply patch file TortoiseSVN?

From the context menu for that folder, click on TortoiseSVN → Apply Patch... This will bring up a file open dialog allowing you to select the patch file to apply.

What is patch in SVN?

A patch is a file that show the differences between two revisions or between your local repository and the last revision your repository is pointing. To share or save a patch of your local uncommitted changes either for peer review or to apply later, do: svn diff > new-feature.patch.


1 Answers

The problem was that TortoiseMerge was maximized. There's a floating window on the left.

Unmaximize the TortoiseMerge window and you can see the file selector window. You can select files in that window to see them in the diff view and there's buttons for applying the patch.

It should look like this:

Screenshot

like image 111
idbrii Avatar answered Oct 23 '22 10:10

idbrii