Hi,
I'm trying to get 3-way merging working in clearcase. I've got the 2-way compare working. The problem seems to be when clearcase is set to automerge and there is a conflict. I've set up my map file to use BComp.exe for the merge:
text_file_delta merge D:\Program Files\Beyond Compare 3\BComp.exe
text_file_delta xmerge D:\Program Files\Beyond Compare 3\BComp.exe
If I merge and there are no conflicts everything works fine -- the file gets merged correctly, and a merge arrow is drawn in clearcase.
However, if there are conflicts, I do not get a BC window -- instead I get a Clearcase dialog that says "The merge completed successfully" even though the file was not changed and no merge arrow was drawn.
If I force a launch of the 3-way merge (via the "merge the file graphically" checkbox in clearcase) everything works great. So I know the capability is there! It only seems to be a bug with automerge when a conflict is detected.
Anyone else run into this? Any ideas/hope for a fix?
BC3 Version 459
command line from clearcase = '-abort -base M:\vob\file@@\main\1 -out M:\vob\file.merge M:\vob\file@@\main\2 M:\vob\file'
- Daniel
I'm trying to get 3-way merging working in clearcase. I've got the 2-way compare working. The problem seems to be when clearcase is set to automerge and there is a conflict. I've set up my map file to use BComp.exe for the merge:
text_file_delta merge D:\Program Files\Beyond Compare 3\BComp.exe
text_file_delta xmerge D:\Program Files\Beyond Compare 3\BComp.exe
If I merge and there are no conflicts everything works fine -- the file gets merged correctly, and a merge arrow is drawn in clearcase.
However, if there are conflicts, I do not get a BC window -- instead I get a Clearcase dialog that says "The merge completed successfully" even though the file was not changed and no merge arrow was drawn.
If I force a launch of the 3-way merge (via the "merge the file graphically" checkbox in clearcase) everything works great. So I know the capability is there! It only seems to be a bug with automerge when a conflict is detected.
Anyone else run into this? Any ideas/hope for a fix?
BC3 Version 459
command line from clearcase = '-abort -base M:\vob\file@@\main\1 -out M:\vob\file.merge M:\vob\file@@\main\2 M:\vob\file'
- Daniel
Comment