Integration with StarTeam Client 10.4.7-45

[dac]

I followed the instructions for using Beyond Compare with StarTeam (3 way merge) I found at http://www.scootersoftware.com/support.php?zz=kb_vcs&cartid=175679213 and it launches Beyond Compare just fine, however, the $resultfile macro doesn't appear to work correctly, because instead of the merge result being saved back into StarTeam, it gets saved out to a file called $resultfile. Anybody know of a setting or tweak I need to make in either StarTeam or Beyond Compare to get this to work?

Thanks
David

[Aaron]

Hi Dac,

3-way Merge is only available for Beyond Compare v3 Pro. Since you posted in the version 2 forum, I assume you are using BC2. BC2 only supports 2 panes and not the /mergeresult variable. Please follow the BC3Std/BC2 instructions just below the BC3Pro instructions for a 2-way merge, or you can install the trial of BC3Pro and test out 3-way merge capabilities.

The BC3 trial can toggle between Pro mode and Std mode in the Help menu -> About dialog, and can be installed without uninstalling BC2. BC3 will install to a separate directory by default, and keep its settings separate.
http://www.scootersoftware.com/download.php

Let us know if you have any questions.

[dac]

It's in the BC2 forum because I wasn't paying attention. I was using the eval version, based on your feedback, I checked the Pro version flag, and it was set. How do I move this question to the proper forum? Because even with evaluate Pro features set, it still writes a file called $resultfile to StarTeam app directory, rather than placing the results back into the merge perspective of StarTeam.

[redmjoel]

I have also seen this issue using Beyond Compare 3. $resultfile appears not to be expanded.

[Craig]

I'd suggest contacting Borland and asking them what the correct command line arguments should be. We're happy to update the VCS knowledge base article of someone gets it working.

[dac]

I have seen success on a few simple tests by modifying the recommended command line from this:

$usertip $branchtip $basefile /mergeoutput=$resultfile

to this

$usertip $branchtip $basefile $resultfile

The Borland client appears to not recognize it's own macros when they are preceeded by prefixes (I tried spaces around the = sign, and quotes, and leaving the = sign out), but as long as I just put the mergeoutput as the 4th parameter, I didn't have a problem. Does anybody know of any issue I'll run into with BC3 by leaving out the identifiying /mergeoutput switch?

Thanks

[Craig]

There shouldn't be any issues. BC handles both cases equally well; the only time it would cause problems is if you wanted a 2-way merge without the center file. Thanks for your help. I'll update the kb article.