Question & Answer
Question
This technote provides you with information about how to change the type managers in IBM Rational ClearCase Remote Client (CCRC) 7.1.1 and later to use 3rd party compare/merge providers.
Cause
In earlier versions of CCRC (7.0.1.x) you would 'copy over' the native compare/merge file with the executable for the 3rd party compare merge tool (for example copying the executable for KDiff3 or Beyond Compare over 'ccrc_xmldiffmrg.exe' (refer to technote 1256807 for earlier versions of CCRC).
In ClearCase 7.1.1 this was changed. The 7.1.1 release added support for using 3rd party Compare/Merge Providers and for running preprocessing scripts or applications before a Compare/Merge operation.
These features can be specified on the new Compare/Merge Providers Preferences page. For more information, refer to the ClearCase Information Center under the topic of Compare/Merge providers preferences.
Answer
The steps of the example:
- In CCRC 7.1, go to the menu
Window > Preferences > ClearCase Remote Client > Integration > Compare Merge > Manage Providers
- In the 'Provider Name' field fill in the 'Path' by browsing to the executable, here 'kdiff3.exe'
- Choose 'Supports Compare Operations'
Fill in the arguments for compare:
%contribs% -fname "%filename1%" -fname "%filename2%"
- Choose 'Supports Merge Operations'
Fill in the arguments for merge: %contribs% -o %merge_out%
- Click 'Apply'
- Click 'New' (in the top of this window under Providers) to have KDiff3 show up on the list
- Click 'OK'
- Check the settings you now have now in the menu
Window > Preferences > ClearCase Remote Client > Integration > Compare Merge > Manage Providers
You now have KDiff3 listed under Providers at the top of the page with checkmarks under 'C' and under 'M'
- Now go one level up in the menu and select 'Compare Merge'
Window > Preferences > ClearCase Remote Client > Integration > Compare Merge
- Under 'When comparing and merging files'
- Use this tool as the default: Choose 'CCRC Integrated (UTF-8)' in the drop down menu
Choose 'Override the default tool for the following types'
- Click 'Add'
- Click under 'Resource..' at the beginning of the line 'CCRC Integrated (UTF-8)'
A drop down list appears:
*.txt
*.java
%directory
%text_file_delta
%utf8_file_delta
For this example, choose *.java
- In the 'Compare Provider' drop down list choose 'KDiff3'
- In the 'CCRC Integrated (UTF-8)' drop down list choose 'KDiff3' as well
- Click 'Apply' and 'OK'
- Select one of your .java files under ClearCase source control: (right click and 'compare with predecessor')
The 'KDiff3' diff/merge tool will come up instead of the default ClearCase diff/merge tool
Here is an example of the CCRC preferences screen when using kdiff3 as Compare/Merge Provider:
Related Information
Was this topic helpful?
Document Information
Modified date:
07 November 2019
UID
swg21433959