Question

I know that from a command prompt, I could do something like

svn diff -rXXX foo.bar

to compare my working copy of foo.bar with the revision XXX, even if this revision was on a merged branch.

How can I do the same with TortoiseSVN? It works like a charm with past revisions on the same branch as my WC but not on different ones…

EDIT:

Thanks to Rob’s answer I’m now able to compare a file in my working copy to a past revision that’s sitting on a merged branch. The last thing I would like to know is if it’s possible to manually merge some of the diffs to my working copy:

• when I right-click a revision of a given file in the “Show log” window and select “Compare with working copy”, the diff viewer (or WinMerge in my case) compares a local copy of the file at the old revision (named after the revision number, and present in a Windows temp folder) to my actual working copy
• when I shift-right-click this same file and choose “Diff with URL”, the files being compared are both local copy made in Windows’ temp folder, preventing me to merge some of the differences directly to my working copy…

Is there a work-around for that?

Answer 1

One way that you can accomplish this is to hold the shift key down when you right click on the file in your working copy that you want to diff. Select TortoiseSVN->Diff with URL. This brings up a dialog that allows you to put in the full server path name to file on the branch you want to diff against. It also allow you to specify the Revision as well. This brings up the TortoiseSVN diff with the 2 files and the differences.

For more information on this you can read this link:
Viewing Differences . This is specifically talked about in the “Differences to another branch/tag” section