Hello,
I've configured StarTeam to use BC3 as the merge utility.
Exe: D:\Program Files\Beyond Compare 3\BCompare.exe
Options: $usertip $branchtip $basefile $resultfile
This seems to work pretty well. I can merge the file, save and upon exit BC3 returns 0. StarTeam will recognize the result file and I can check in the changes.
However, using this configuration the source always ends up being on the right when BC3 starts. I like my source on the left, so I swap the sides. I can address all the conflicts and save. Now when BC3 exits, no matter what, BC3 returns 101. It seems BC3 should be returning 1. This only occurs when I have swapped sides. At this point StarTeam will not pick up the result file to check in.
Please let me know if you require additional details.
BC3 - version 3.2.4 (build 13298)
StarTeam - Version 11.0.0-73
Thanks!
I've configured StarTeam to use BC3 as the merge utility.
Exe: D:\Program Files\Beyond Compare 3\BCompare.exe
Options: $usertip $branchtip $basefile $resultfile
This seems to work pretty well. I can merge the file, save and upon exit BC3 returns 0. StarTeam will recognize the result file and I can check in the changes.
However, using this configuration the source always ends up being on the right when BC3 starts. I like my source on the left, so I swap the sides. I can address all the conflicts and save. Now when BC3 exits, no matter what, BC3 returns 101. It seems BC3 should be returning 1. This only occurs when I have swapped sides. At this point StarTeam will not pick up the result file to check in.
Please let me know if you require additional details.
BC3 - version 3.2.4 (build 13298)
StarTeam - Version 11.0.0-73
Thanks!
Comment