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.

回答1:

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'.

回答2:

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:

回答3:

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.

来源：https://stackoverflow.com/questions/4675517/compare-files-between-two-branches-in-tortoisesvn