![]() ![]() Reliable Software offers a discounted bundle of theĬhoose Settings from the Document Explorer's Project menu.Ĭhange the Difference Analysis Tool to "Custom Tool".Įnter the path to BComp.exe in the Difference Analysis Tool edit.ĬVS does not support external diff or merge tools. Visit Reliable Software for details on using Beyond Compare withĬode Co-op. Make 4 copies of bcomp.exe and rename them to ccrc_cleardiff.exe, ccrc_cleardiffmrg.exe, ccrc_worddiffmrg.exe and ccrc_xmldiffmrg.exe.Ĭhange "CCRC Integrated (UTF-8)" to "ClearCase External" under Preferences | CCRC | Integration | Compare_Merge. Move ccrc_cleardiff.exe, ccrc_cleardiffmrg.exe, ccrc_worddiffmrg.exe and ccrc_xmldiffmrg.exe to a backup folder. Note that the version number in path is subject to change.Ĭopy "C:\Program Files\Beyond Compare 3\bcomp.exe" into the folder. Locate the plugins folder, which will contain a specific version named subfolder. A helper that improves BC2's support is available here. Overriding compare, merge,Īnd xmerge is not supported. To use Beyond Compare 2, 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 3\BComp.exe ![]() Text_file_delta merge C:\Program Files\Beyond Compare 3\BComp.exe ![]() Text_file_delta xcompare C:\Program Files\Beyond Compare 3\BComp.exe Text_file_delta compare C:\Program Files\Beyond Compare 3\BComp.exe Go into the "C:\Program Files\Rational\ClearCase\lib\mgrs" folder.Įdit "map" and edit the following lines to point to Beyond Compare: Select "Beyond Compare" in the ToolName drop-down.Įnter the complete path to your BComp.exe in the Compare, 2-wayīComp.exe $(TrunkFile) $(BranchFile) /mergeoutput=$(ResultsFile)īComp.exe $(TrunkFile) $(BranchFile) $(AncestorFile) $(ResultsFile) Switch to the Merge Tool tab in the Options dialog. Select Source Control | Subversion User Tools.įor the Diff and Merge entries, select Beyond Compare from the dropdown. Merge (v3 Pro): overwrite the preset with: /usr/bin/bcompare %1% %2% %a% -mergeoutput=%o% -lefttitle="%4%" -righttitle="%5%".Diff: overwrite the preset with: /usr/bin/bcompare %1% %2% -lefttitle="%3%" -righttitle="%4%".Merge (v3 Pro): overwrite the preset with: "C:\Program Files\Beyond Compare 3\bcomp.exe" %1% %2% %a% /mergeoutput=%o%.Diff: overwrite the preset with: "C:\Program Files\Beyond Compare 3\bcomp.exe" %1% %2% /lefttitle="%3%" /righttitle="%4%".SCM QVCS Rational Synergy RoboHelp HTML Roundtable TSMS SourceAnyWhere for VSS SourceGear Vault / Fortress SourceOffSite StarTeam Subversion Surround SCM Team Coherence Team Foundation Server (TFS) Telelogic Synergy TortoiseCVS TortoiseGit TortoiseSVN VersionMaster Visual SourceSafe 2005 Visual Studio 2005 with Visual SourceSafe 2005 WinCVS KĪccuRev AnkhSVN CA Software Change Manager ClearCase ClearCase Remote Client Code Co-op CS-RCS CVS Dimensions CM / PVCS / Serena Eclipse IDE FreeVCS Git for Linux Git for Windows KDESVN Mercurial / HG / TortoiseHg MKS Integrity NetBeans Perforce Plastic Should prefix command line switches with "-" instead of "/".Ħ4-bit Windows users should replace "c:\program files" with "c:\program files (x86)". Unless otherwise specified, all examples are based on BeyondĬompare v2 users should replace BComp.exe with BC2.exe and change the path to Beyond Compare 2's install folder. Let us know if you have one to add to the list. The following are configuration instructions for specific products. 注意用以版本比较时,都是使用的 bcomp.exe(其存在的目的就是专为完成此事)īeyond Compare can be configured as the external difference utility in many popular VCS applications. Using Beyond Compare with Version Control Systems ![]()
0 Comments
Leave a Reply. |