Code Compare Integration with TortoiseSVN
To integrate our diff and merge tool into TortoiseSVN, perform the following
steps:
Diff tool integration:
- Select Tortoise SVN → Settings from the TortoiseSVN popup menu in Windows Explorer.
- Select the External Programs → Diff Viewer page.
-
Command: "[InstallationDir]\CodeCompare.exe"/SC=SVN /B %base %mine
-
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
Merge tool integration:
- Select Tortoise SVN → Settings from the TortoiseSVN popup menu in Windows Explorer.
- Open the External Programs → Merge Tool page.
-
Command:
"[InstallationDir]\CodeMerge.exe" /TF=%theirs /MF=%mine
/RF=%merged /BF=%base /REMOVEFILES /SC=SVN /B
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.