Copy bcomp.exe from C:\Program Files\Beyond Compare 4 into the Dimensions folder and rename it to pvcsmerge.exe.Navigate to the Dimensions / PVCS install folder and find the file pvcsmerge.exe and rename it to.Change "CCRC Integrated (UTF-8)" to "ClearCase External" under Preferences | CCRC | Integration | Compare_Merge.ĬVS does not support external diff or merge tools.ĭimensions CM / PVCS / Serena BC version 3 or 4.Make 4 copies of bcomp.exe and rename them to ccrc_cleardiff.exe, ccrc_cleardiffmrg.exe, ccrc_worddiffmrg.exe and ccrc_xmldiffmrg.exe. Move ccrc_cleardiff.exe, ccrc_cleardiffmrg.exe, ccrc_worddiffmrg.exe and ccrc_xmldiffmrg.exe to a backup folder.Copy C:\Program Files\Beyond Compare 4\bcomp.exe into the folder.Note that the version number in path is subject to change.Locate the plugins folder, which will contain a specific version named subfolder.Navigate to ClearCase Remote Client | Integration | Compare/Merge (up one level) to override the CCRC Integrated (UTF-8) as the default diff/merge and set to bcomp.exe.Click Apply, then New to add to the Providers list.Merge : For Supports Merge Operations add: %contrib1% %contrib2% ?se% /mergeoutput="%merge_out%".Diff: For Supports Compare Operations add: %contribs% /vcs1="%filename1%" /vcs2="%filename2%".For Provider Name, enter the path to Beyond Compare's install directory and bcomp.exe.Then select ClearCase Remote Client | Integration | Compare/Merge | Manage Providers Overriding compare, merge, and xmerge is not supported.Ī helper that improves BC2's support is available here. BC version 2įor BC2, only change the xcompare line of the map file. Make the same change to lines beginning with _html, _xml, _html2, _xml2 to use Beyond Compare for HTML and XML comparisons. Text_file_delta xmerge C:\Program Files\Beyond Compare 4\BComp.exe Text_file_delta xcompareĜ:\Program Files\Beyond Compare 4\BComp.exe
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |