Clarification of the steps from via Support Beyond Compare to use Beyond Compare 3 or 2 from Visual Studio and with Team Foundation System.
First run this little batch file to show you the exact location of BComp.exe:
@echo off
call :show "%ProgramFiles%\Beyond Compare 3\BComp.exe"
call :show "%ProgramFiles(x86)%\Beyond Compare 3\BComp.exe"
call :show "%ProgramFiles%\Beyond Compare 2\BComp.exe"
call :show "%ProgramFiles(x86)%\Beyond Compare 2\BComp.exe"
goto :eof
:show
if not exist %1 goto :eof
echo Beyond Compare is here:
echo %~1
(I know that this will not find a Portable Beyond Compare installation).
Note that BComp.exe (for GUI use) and BComp.com (for console use) are bootstrappers for BCompare.exe. Both will wait when ran from a GUI or console for the comparison to finish. Starting BCompare.exe will not wait. See BComp.exe vs BComp.com – Scooter Forums for more information on this.
Everywhere you see path to BComp.exe below, enter the path that the above batch file tells you.
The first two pictures on the right show common steps for all three integrations. The images below are the specific ones for each integration. You can click on each image to view a larger version.
The steps work with the full version of Visual Studio and the Team Explorer edition of Visual Studio.
You can find different arguments for other tools on this excellent diff/merge configuration in Team Foundation – common Command and Argument values post by James Manning.
Adding diff/compare support to Visual Studio
In Visual Studio Choose Options from the Tools menu.- Expand Source Control in the treeview.
- Click Visual Studio Team Foundation Server in the treeview.
- Click the Configure User Tools button.
- Click the Add button.
- Enter “.*” in the Extension edit.
- Choose
Compare in the Operation combobox.
- Enter the
path to BComp.exe in the Command edit.
- In the Arguments edit, use:
%1 %2 /title1=%6 /title2=%7
- Then press OK, then OK, then OK
Adding 3-way Merge to Visual Studio
You need Beyond Compare version 3 Professional for this.
(note: only the steps marked with * are different from above)
In Visual Studio Choose Options from the Tools menu.- Expand Source Control in the treeview.
- Click Visual Studio Team Foundation Server in the treeview.
- Click the Configure User Tools button.
- Click the Add button.
- Enter “.*” in the Extension edit.
- * Choose
Merge in the Operation combobox.
- Enter the
path to BComp.exe in the Command edit.
- * In the Arguments edit, use:
%1 %2 %3 %4 /title1=%6 /title2=%7 /title3=%8 /title4=%9
- Then press OK, then OK, then OK
Adding 2-way Merge to Visual Studio
This is for Beyond Compare version 2, and Beyond Compare version 3 Standard.
(note: only the step marked with * is different from above)
In Visual Studio Choose Options from the Tools menu.- Expand Source Control in the treeview.
- Click Visual Studio Team Foundation Server in the treeview.
- Click the Configure User Tools button.
- Click the Add button.
- Enter “.*” in the Extension edit.
- Choose
Merge in the Operation combobox.
- Enter the
path to BComp.exe in the Command edit.
- * In the Arguments edit, use:
%1 %2 /savetarget=%4 /title1=%6 /title2=%7
- Then press OK, then OK, then OK
To summarize, the differences
Functionality
|
entry in
Operation combobox
|
content of
Arguments edit
|
Beyond Compare
version/edition |
| diff/merge |
Compare |
%1 %2 /title1=%6 /title2=%7 |
any version/edition |
| 3-ware compare |
Merge |
%1 %2 %3 %4 /title1=%6 /title2=%7 /title3=%8 /title4=%9 |
3/Professional |
| 2-way compare |
Merge |
%1 %2 /savetarget=%4 /title1=%6 /title2=%7 |
2 or 3/Standard |
Hope this helps a few people.
–jeroen
via:
The Wiert Corner - irregular stream of stuff 