Code Compare Integration with TortoiseSVN

To integrate our diff and merge tool into TortoiseSVN, perform the following steps:

Diff tool integration:

  1. Select Tortoise SVN → Settings from the TortoiseSVN popup menu in Windows Explorer.
  2. Select the External Programs → Diff Viewer page.

  3. Command: "[InstallationDir]\CodeCompare.exe"/SC=SVN /B %base %mine

  4. To work with comments in Review Assistant you need to specify additional arguments: /SC=TortoiseSVN /B /p1=%burl /p2=%yurl /r1=%brev /r2=%yrev %base %mine
TFS Diff Tool

Merge tool integration:

  1. Select Tortoise SVN → Settings from the TortoiseSVN popup menu in Windows Explorer.
  2. Open the External Programs → Merge Tool page.

  3. Command:  "[InstallationDir]\CodeMerge.exe" /TF=%theirs /MF=%mine /RF=%merged /BF=%base /REMOVEFILES /SC=SVN /B

TFS Merge Tool

Note: Use your product installation folder instead of [InstallationDir]. By default, it is C:\Program Files\Devart\Code Compare.

For a brief introduction to the features of our diff and merge tool, refer to the product's overview page.