CODEWITHSUNDEEP
svnversion-controltortoisesvn
Kris Erickson
Kris Erickson

Reputation: 33854

Compare files between two branches in TortoiseSVN

I know how to do this in SVN,

svn diff http://svn.example.com/branches/A/File1.txt http://svn.example.com/branches/B/File1.txt

But there has to be a less painful way to do this in TortoiseSVN. You would think that you could do it from the Show Log, but it appears to only show revisions on the current branch.

Upvotes: 95

Views: 71618

Answers (4)

jumping_monkey
jumping_monkey

Reputation: 7865

The answers here are cool, i love it! Another cool way to diff, in my case, 2 different files found in 2 different folders:

Step 1 - Right-click, Diff later

enter image description here

Step 2 - Right-click, Diff with "..."

enter image description here



That's it! :)

Upvotes: 2

Antonio Pérez
Antonio Pérez

Reputation: 7002

  1. Go to the repository browser (<right click>/TortoiseSVN/Repo-browser/<enter URL>).
  2. Open right click menu on branch B, select 'Mark for comparison'.
  3. Then open right click menu on branch A, select 'Compare URLs' or 'Show differences as unified diff'.

Upvotes: 120

Ben
Ben

Reputation: 409

I find this method to be much easier:

Open the revision graph for the file you want to diff (context menu->TortoiseSVN->Revision Graph). Select the first revision, and then control-click to select the second revision. Now right click on one of the selected revisions, and select Compare Revisions from the context menu.

Tested on TortoiseSVN 1.7.6.

enter image description here

Upvotes: 24

Kris Erickson
Kris Erickson

Reputation: 33854

I don't know how new this feature is (I certainly read the documentation and didn't find it when I posted the question), but if you hold the Shift button down when you right click on a file, you can compare URLs without having to go to the repository browser.

See Difference to another branch/tag in the Viewing Differences documentation.

To illustrate:

Enter image description here

Upvotes: 70

Related Questions