How to using Araxis merge utility in Starteam5.1.
Information in this Brief applies to:
StarTeam 5.1 allows you to use a 3rd party comparison/merging tool. The below instructions applies to Araxis merge, a tool that enables you to compare and work with different revisions of text files, ASCII, mbcs and Unicode files. http://www.araxis.com/merge/
Note: The Professional Edition of Araxis Merge is required to enable the comparison of two modified versions of a file with their common ancestor.
1. Select Tools\Workstation Options from the menu bar. The Workstation Options dialog opens.
2. Select the Files tab.
3. Select the Merge Utility check box.
4. In the text box, type the path to or browse for that editor.
"c:/path/to/starteam/merge.exe" (default install is at: C:\Program Files\Araxis\Araxis Merge 2001 Professional Evaluation\compare.exe)
5. In the Options text box, add the command line options that go with that utility. Use the following terms:
"/wait /a2 /max /2 $usertip $basefile $branchtip $resultfile"
NOTE: Do not proceed with "-s " option as indicated in Online Help.
$usertip A place holder for the path to the local working file to be merged.
$branchtip A place holder for the path to the tip revision of the file to be merged.
$basefile A place holder for the path to the common ancestor for the $branchtip and $usertip files.
$resultfile A place holder for the path to the file that will store the output from the merged file.
6. Click OK
StarTeam assumes that your options are appropriate for the utility to be used. Each time that StarTeam needs to call the merge utility, it replaces the terms that start with $ with actual paths to those files and asks the operating system to execute the completed command.