vss配置beyond compare
来源:互联网 发布:程序侠淘宝客破解版 编辑:程序博客网 时间:2024/05/17 03:20
Beyond Compare can be configured as the external difference utility in many popular VCS applications. The following are configuration instructions for specific products. Let us know if you have one to add to the list. Beyond Compare v3: These examples are based on Beyond Compare 3 Beyond Compare v2: To use Beyond Compare 2 replace Linux users should prefix command line switches with "-" instead of "/". Compare 2-way Merge 3-way Merge (v3 Pro) Make the same change to lines beginning with To use Beyond Compare 2, only change the Visit Reliable Software for details on using Beyond Compare with Code Co-op. Reliable Software offers a discounted bundle of the two products. CVS does not support external diff or merge tools. BC version 3: In Dimensions CM 10 you can edit your BC version 2: Follow the instructions above, but instead of using Diff 3-way Merge (v3 Pro) 2-way Merge (v3 Std, v2) Note: If you use the Git for Windows' Bash Command Prompt instead of the default Windows Command Prompt, you need to escape the Diff To launch a diff with BC3, use the command "git difftool foofile.txt". 3-way Merge (v3 Pro) To launch a 3-way merge with BC3, use the command "git mergetool foofile.txt". Diff Once set up you can compare revisions from the command line using 3-way Merge (v3 Pro) Diff 3-way Merge (v3 Pro) 2-way Merge (v3 Std, v2) Use the same steps as the 3-way merge above, but use the command line: Diff 3-way Merge (v3 Pro) Use this for the merge tool command line: 2-way Merge (v3 Std, v2) Use this for the merge tool command line: Once configured, selecting Team | Local History | Show Local History will launch a diff in Beyond Compare. Diff 3-way Merge (v3 Pro) 2-way Merge (v3 Std, v2) Diff 3-way Merge (v3 Pro) 2-way Merge is not supported because $resultfile is not expanded if used as an argument to /savetarget=. Instead of using a batch file, create a file named "bc.sh" with the following line: Diff: Create a file named /usr/bin/bcdiff.sh with the following line: Edit "$HOME/.subversion/config" and add the line "diff-cmd = /usr/bin/bcdiff.sh". Merge: Create a file named /usr/bin/bcmerge.sh with the following line: Edit "$HOME/.subversion/config" and add the line "merge-tool-cmd = /usr/bin/bcmerge.sh". Diff, 2-way Merge (3-way merge not supported) see Mercurial / HG Diff 3-way Merge (v3 Pro) Diff To use Beyond Compare for image comparisons either replace the file C:/Program Files/TortoiseSVN/bin/TortoiseIDiff.exe with a copy of BComp.exe, or click the Advanced button on theDiff Viewer tab and add each image type's extension with the same command line as above. 3-way Merge (v3 Pro) 2-way Merge (v3 Std, v2) see SourceGear Vault / Fortress Diff Merge Visual SourceSafe 6.0 and earlier do not support external difference utilities. SourceOffsite and VersionMaster can both use Beyond Compare in combination with SourceSafe.Using Beyond Compare with Version Control Systems
BComp.exe
with BC2.exe
and change the path to Beyond Compare 2's install folder.ACCUREV
Windows
Linux"C:/Program Files/Beyond Compare 3/bcomp.exe" %1% %2% /lefttitle="%3%" /righttitle="%4%"
"C:/Program Files/Beyond Compare 3/bcomp.exe" %1% %2% %a% /mergeoutput=%o% /lefttitle="%4%" /righttitle="%5%" /centertitle="%3%"
/usr/bin/bcompare %1% %2% -lefttitle="%3%" -righttitle="%4%"
/usr/bin/bcompare %1% %2% %a% -mergeoutput=%o% -lefttitle="%4%" -righttitle="%5%" -centertitle="%3%"
ANKHSVN
CA HARVEST CHANGE MANAGER
BComp.exe /readonly $(File1) $(File2)
BComp.exe $(TrunkFile) $(BranchFile) /mergeoutput=$(ResultsFile)
BComp.exe $(TrunkFile) $(BranchFile) $(AncestorFile) $(ResultsFile)
CLEARCASE
text_file_delta compare C:/Program Files/Beyond Compare 3/BComp.exe
text_file_delta xcompareC:/Program Files/Beyond Compare 3/BComp.exe
text_file_delta merge C:/Program Files/Beyond Compare 3/BComp.exe
text_file_delta xmerge C:/Program Files/Beyond Compare 3/BComp.exe_html
, _xml
, _html2
, _xml2
to use Beyond Compare for HTML and XML comparisons.xcompare
line of the map file. Overriding compare
, merge
, andxmerge
is not supported. A helper that improves BC2's support is available here.CLEARCASE REMOTE CLIENT
/CCRC/plugins/com.ibm.rational.clearcase.compare_merge.win32.x86_7.0.1.D061004".
(Note that the version number in path is subject to change.)CODE CO-OP
CS-RCS
CVS
DIMENSIONS CM / PVCS / SERENA
pvcsmerge.exe
and rename it topvcsmerge.exe.exe
.bcomp.exe
from C:/Program Files/Beyond Compare 3
into the Dimensions folder and rename it topvcsmerge.exe
.native.properties
file instead. The integration isn't as complete in that case, so file format/rules matching don't work correctly and folder comparisons aren't supported.BComp.exe
use the copy of pvcsmerge.exe
inpvcsmergev8.zip for PVCS 6.8, 8.0, and Merant Dimensions 8, or in pvcsmerge75.zip for PVCS 7.5.ECLIPSE IDE
Launch Beyond Compare from the Eclipse IDE using the Beyond CVS plug-in by Chris Callandar and Nick Boldt.FREEVCS
GIT FOR LINUX
#!/bin/sh
# diff is called by git with 7 parameters:
# path old-file old-hex old-mode new-file new-hex new-mode
"<path_to_bc3_executable>" "$2" "$5" | cat
$ git config --global diff.external <path_to_wrapper_script>
$ git config --global merge.tool bc3
$ git config --global mergetool.bc3.cmd "/usr/bin/bcompare /$LOCAL
/$REMOTE /$BASE /$MERGED"
$ git config --global mergetool.bc3.trustExitCode true
$ git config --global merge.tool bc3
$ git config --global mergetool.bc3.cmd "/usr/bin/bcompare /$LOCAL
/$REMOTE -savetarget=/$MERGED"
$ git config --global mergetool.bc3.trustExitCode trueGIT FOR WINDOWS
$
character with /
.
git config --global diff.tool bc3
git config --global difftool.bc3.cmd "/"c:/program files/beyond compare 3/bcomp.exe/" /"$LOCAL/" /"$REMOTE/""
git config --global difftool.prompt false
git config --global merge.tool bc3
git config --global mergetool.bc3.cmd "/"c:/program files/beyond compare 3/bcomp.exe/" /"$LOCAL/" /"$REMOTE/" /"$BASE/" /"$MERGED/""
git config --global mergetool.bc3.trustExitCode trueKDESVN
bcompare -readonly %1 %2
bcompare %s1 %s2 %t
bcompare %n %m %o %t
MERCURIAL / HG / TORTOISEHG
To configure Mercurial you need to edit the file %USERPROFILE%/Mercurial.ini
or $HOME/.hgrc
. Add the following lines, using existing INI sections if they already exist: [extensions]
extdiff =
[extdiff]
cmd.bcomp = C:/Program Files/Beyond Compare 3/BComp.exe
opts.bcomp = /ro
[tortoisehg]
vdiff = bcomphg bcomp -r <rev1> [-r <rev2>] [<filename>]
[merge-tools]
bcomp.executable = C:/Program Files/Beyond Compare 3/BComp.exe
bcomp.args = $local $other $base $output
bcomp.priority = 1
bcomp.premerge = True
bcomp.gui = True
[ui]
merge = bcompMICROSOFT TEAM FOUNDATION SERVER (TFS)
%1 %2 /title1=%6 /title2=%7
%1 %2 %3 %4 /title1=%6 /title2=%7 /title3=%8 /title4=%9
%1 %2 /savetarget=%4 /title1=%6 /title2=%7
MICROSOFT VISUAL STUDIO 2005 WITH VISUAL SOURCESAFE 2005
Supported for "Microsoft Visual SourceSafe" plug-in. The "Microsoft Visual SourceSafe (Internet)" plug-in does not support external diff tools.
"C:/Program Files/Beyond Compare 3/bcomp.exe" %1 %2
MKS SOURCE INTEGRITY
"C:/Program Files/Beyond Compare 3/BComp.exe" /title1="{1}" /title2="{2}" "{3}" "{4}"
"C:/Program Files/Beyond Compare 3/BComp.exe" /title1="{1}" /title2="{2}" /title3="{0}" "{5}" "{6}" "{4}" "{7}"
"C:/Program Files/Beyond Compare 3/BComp.exe" /title1="{1}" /title2="{2}" "{5}" "{6}" /savetarget="{7}"
NETBEANS
C:/Program Files/Beyond Compare 3/BComp.exe {0} {1}
PERFORCE
P4V (The Perforce Visual Client)
P4Win (The Perforce Windows Client)
%1 %2 %b %r
P4 (The Perforce Command Line Client)
/lefttitle="%L" /righttitle="%R" %1 %2
/vcsleft="%T" /vcsright="%Y" %2 %3 %1 %4
P4DIFF=C:/Program Files/Beyond Compare 3/BComp.exe
P4MERGE=C:/Program Files/Beyond Compare 3/BCompP4Merge.bat
"C:/Program Files/Beyond Compare 3/BComp" %2 %3 %1 %4
QVCS
C:/Progra~1/Beyond~1/BComp.exe file1Name file2Name
ROUNDTABLE TSMS
ASSIGN Mexe = SEARCH("visdiff/visdiff.exe").
to:
ASSIGN Mexe = SEARCH("C:/Progra~1/Beyond~1/bcomp.exe").
SOURCEANYWHERE FOR VSS
C:/Program Files/Beyond Compare 3/bcomp.exe
/readonly /title1="%FIRST_LABEL%" /title2="%SECOND_LABEL%" "%FIRST_FILE%" "%SECOND_FILE%"
"%FIRST_DIR%" "%SECOND_DIR%"
/leftreadonly /title1="%FIRST_LABEL%" /title2="%SECOND_LABEL%" "%FIRST_FILE%" "%SECOND_FILE%"
SOURCEGEAR VAULT / FORTRESS
"%LEFT_PATH%" "%RIGHT_PATH%" /ro /title1="%LEFT_LABEL%" /title2="%RIGHT_LABEL%"
"%WORKING_PATH%" "%OTHER_PATH%" "%BASELINE_PATH%" "%DEST_PATH%" /title1="%WORKING_LABEL%" /title2="%OTHER_LABEL%" /title4="%DEST_LABEL%"
"%WORKING_PATH%" "%OTHER_PATH%" /title1="%WORKING_LABEL%" /title2="%OTHER_LABEL%" /savetarget="%DEST_PATH%"
SOURCEOFFSITE
Beyond Compare 1.9 is the default external difference utility in SourceOffsite Collaborative Edition. To upgrade to Beyond Compare 3 follow the instructions above.STARTEAM
$file1 $file2
$usertip $branchtip $basefile $resultfile
SUBVERSION
Windows
Cygwin (http://www.cygwin.com/)
"C:/Progra~1/Beyond~1/bcomp.exe" "%6" /title1=%3 "%7" /title2=%5
# [helpers]
# diff-cmd = diff_program (diff, gdiff, etc.)
to:
[helpers]
diff-cmd = C:/Progra~1/Beyond~1/svn.bat
"$(cygpath 'C:/Progra~1/Beyond~1/bcomp.exe')" `cygpath -w "$6"` `cygpath -w "$7"` /title1="$3" /title2="$5" /readonly
/usr/bin/bcompare "$6" "$7" -title1="$3" -title2="$5" -readonly
/usr/bin/bcompare "$2" "$3" "$1" "$4"
SURROUND SCM
TEAM COHERENCE
TELELOGIC SYNERGY
Compare_cmd = C:/Progra~1/Beyond~1/bcomp.exe %file1 %file2 /lefttitle=%file1_label /righttitle=%file2_label
merge_cmd = C:/Program~1/Beyond~1/bcomp.exe %file1 %file2 %ancestor /mergeoutput=%outfile /lefttitle=%file1_label /righttitle=%file2_label
TORTOISECVS
C:/Program Files/Beyond Compare 3/BComp.exe
/readonly "%1" "%2"
C:/Program Files/Beyond Compare 3/BComp.exe
/leftreadonly "%mine" "%yours"
TORTOISEHG
TORTOISEGIT
"C:/Program Files/Beyond Compare 3/BComp.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly
"C:/Program Files/Beyond Compare 3/BComp.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname
TORTOISESVN
"C:/Program Files/Beyond Compare 3/BComp.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly
"C:/Program Files/Beyond Compare 3/BComp.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname
"C:/Program Files/Beyond Compare 3/BComp.exe" %mine %theirs /savetarget=%merged
VAULT / FORTRESS
VERSIONMASTER
VISUAL SOURCESAFE 2005
"C:/Program Files/Beyond Compare 3/bcomp.exe" %1 %2
"C:/Program Files/Beyond Compare 3/bcomp.exe" %1 %2 /savetarget=%4
WINCVS
原文链接:http://www.scootersoftware.com/support.php?c=kb_vcs.php
- vss配置beyond compare
- VSS配置外部对比工具Beyond Compare
- Beyond Compare配置
- git 如何配置 beyond compare
- git中配置Beyond Compare作为mergetool
- git 使用beyond compare 的配置方法
- mac下beyond compare配置图
- Mac SourceTree配置Beyond Compare比较工具
- git 配置支持 Beyond Compare 4
- Mac OS X 配置 Beyond Compare
- SourceTree配置diff工具Beyond Compare
- Beyond Compare
- Beyond Compare
- beyond compare
- Beyond Compare
- Beyond Compare
- Beyond Compare
- mac下source tree配置外部比较工具beyond compare
- ruby下cassandra的简单例子
- Linux 书籍推荐
- VC 里CSTRING时间变量比较
- TCP/IPv6
- ARM基于Linux系统下的视频监控(初步)
- vss配置beyond compare
- 设置保护视力的背景色
- 计算机网络总览
- 写篇博客
- linux coredump配置与调试
- ASP.NET页面间传值的几种方式
- 世纪佳缘龚海燕:冲动的第一红娘
- 2d , 3d engine
- 单链表的增删查改(转贴)