Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Using Tortoise SVN diff in TFS

I want to use Tortoise SVN diff utility with TFS. I know how to configure user tools in TFS. What I need is installer for Tortoise SVN diff utility. I think I need to install full Tortoise SVN to get SVN diff tool, is there a standalone version of this tool available for download?

I know various other diff tools are available like winMerge etc. but I am very much familiar with tortoise svn diff.

like image 687
akjoshi Avatar asked Oct 18 '10 12:10

akjoshi


People also ask

How to compare two files using TortoiseSVN?

Just hold down the Shift key while you right click on the file. Then select TortoiseSVN → Diff with URL. In the following dialog, specify the URL in the repository with which you want to compare your local file to.


2 Answers

If you want to use Tortoise Merge with TFS. You need to install Tortoise SVN.

And then follow the steps here

Compare Command: C:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe
Arguments:
/base:%1 /mine:%2 /basename:%6 /minename:%7

Merge Command: C:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe
Arguments: /base:%3 /mine:%2 /theirs:%1 /basename:%8 /minename:%7 /theirsname:%6 /merged:%4 /mergedname:%9

like image 122
Dan Avatar answered Oct 11 '22 21:10

Dan


The TSVN diff tools are available separately. See the download page, scroll down to "Tools".

Or directly from here.

like image 23
Stefan Avatar answered Oct 11 '22 21:10

Stefan