How to use CodeWright"s merge utility in StarTeam 5.1.

0 Likes

Problem:

How to use CodeWright"s merge utility in StarTeam 5.1.

Resolution:

Information in this Brief applies to:

  • StarTeam 5.1 and CodeWright 6 and 7
  • Windows 98, NT, 2000

Overview

You can use CodeWright"s merge utility with Starteam 5.1. The merge utility must be used as part of the whole CW editor.

Details

In StarTeam, go to Tools|Workstation Options.

1. Click the File tab.

2. Check mark "Merge Utility" and place the following command in the box:

\cw32.exe (put the correct path to CW32 in )

In the options box, all on one line, put:

-NOSPLASH -n -m -X"Merge("$basefile",0,"Base File","$branchtip",0,"Branch Tip","$usertip",0,"User Tip","$resultfile","### MERGE ###")" "$resultfile"

3. Click OK.

Now, when a StarTeam file has a status of merge, it will use CodeWright as the merge utility on check in or check out. It will launch CW, and load a file into CodeWright that has merged changes for editing. There may be conflicts that need to be resolved. Make the edits, save the file and close CodeWright. When you return to StarTeam, you will have a message asking if you want to overwrite the current file with the merge result. If this is what you want to do, then click yes. Another prompt will then ask if you want to continue with the check in or check out. Click Yes if this is what you want to do.

You can also use CodeWright as the difference utility for StarTeam.

In StarTeam, go to Tools|Workstation Options.

1. Click the File tab.

2. Check mark "Comparison Utility" and place the following command in the box:

\cw32.exe (put the correct path to CW32 in )

In the options box, all on one line, put:

-NOSPLASH -n -m -X"cwdiff $file1 $file2"

3. Click OK.

Now, if you want to compare a previous file revision with the current revision, select the revision you want to compare, then go to File|Compare Contents in Starteam. CodeWright will either load the files into a side by side comparison.

Old KB# 28334
Comment List
Related
Recommended