Version Control
System,是一种记录叁个或若干文书内容退换,以便未来翻开特定版本修订意况的体系。版本调控系统不仅能够选取于软件源代码的文件文件,何况能够对另外项指标文书实行版本调节。用的相当多的如svn,git等。

金沙国际官网 1

Using Beyond Compare with Version Control Systems

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.

金沙国际官网 2 Beyond Compare v3: 
These examples are based on Beyond Compare 3

金沙国际官网 3 Beyond Compare v2:  To
use Beyond Compare 2 replace BComp.exe with BC2.exe and change the
path to Beyond Compare 2’s install folder.


version control
软件配置管理,版本调控,也被叫做修订控制源控制\[1\]是对文档的更改,管理计算机程序,大型网站,以及其他信息集合。更改通常由数字或字母代码标识,称为“修订号”,“修订级别”或简称“修订版”。例如,初始文件集是“修订版1”。进行第一次更改时,结果集为“版本2”,依此类推。每个修订都与时间戳和进行更改的人相关联。可以比较,恢复和某些类型的文件的修订,

  为了让差别连串上的开荒者能够协同专门的职业,集中国化学工业进出口总集团的版本调控系统出现。那类系统都有一个单一的集中管理的服务器,保存全部文件的修订版本。而协同工作的大家都经过顾客端连接到那台服务器,获取最新的文本大概提交更新。集中国化学工业进出口总公司的版本调控系统,最明显的毛病是大旨服务器的单点故障难题。假如宕机,那么就能产出何人都心余力绌提交更新的景色,那么也就不能够协同职业;假设磁盘发生故障,而备份又远远不够即时,那么就有错过数据的危害,最坏的处境是错过整个项目的野史变动记录。因而,分布式版本调节系统问世了。

维基百科上的Git:

AnkhSVN

Visual Studio 2008

  1. Open Visual Studio.
  2. Select AnkhSVN from the Tools menu.
  3. Select Edit the AnkhSVN Configuration.
  4. In the DiffExePath box, enter the following:
    "C:\Program Files\Beyond Compare 3\BComp.exe" "%base" "%mine" /fv /title1="%base" /title2="%mine" /leftreadonly

Visual Studio 2005

  1. Open Visual Studio.
  2. Select Tools from the Options menu.
  3. Under Source Control click on Subversion.
  4. In the External diff path box, enter the following:
    "C:\Program Files\Beyond Compare 3\BComp.exe" "%base" "%mine" /fv /title1="%base" /title2="%mine" /leftreadonly

企业和操纵修订的逻辑方式的须要大致与编写制定期存款在一样长,但在盘算时期最先时,修订调控变得尤为关键和复杂性。书籍版本和正规修订版的号码能够追溯到仅印刷版时期。前几天,最有力量的版本调节系统是在软件开垦中利用的系统,个中一组人能够同一时间对相同的公文进行退换。

  Git和另外版本调节系统的首要出入在于:Git只关心文件数量的完好是或不是发生了变通,而比相当多的别样系统则只关切文件内容的切切实实差距,它们在各类版本中记录着相继文件的实际差距。在Git中的绝大大多操作都只需求拜访当三步跳件和财富,无需联网。那是因为Git在本地球磁性盘上就保存着富有当前项指标历史更新,所以拍卖起来速度相当慢,那是行使空间换时间的管理格局。使用Git,尽管在未曾VPN或互联网的图景下,你同样可以充足喜悦的再三提交更新,等到有了网络的时候再付出到长途的库房。

Git is a version control system(VCS) that is used for software
development and other version control tasks.

CA Harvest Change Manager
  1. Open the Workbench.
  2. Select Options from the Tools menu.
  3. Switch to the Merge Tool tab in the Options dialog.
  4. Select “Beyond Compare” in the ToolName drop-down.
  5. Enter the complete path to your BComp.exe in the Compare,
    2-way Merge金沙国际官网,, and 3-way Merge fields.

Compare
BComp.exe /readonly $(File1) $(File2)

2-way Merge
BComp.exe $(TrunkFile) $(BranchFile) /mergeoutput=$(ResultsFile)

3-way Merge (v3 Pro)
BComp.exe $(TrunkFile) $(BranchFile) $(AncestorFile) $(ResultsFile)


概述:

百度宏观上的Git:

ClearCase
  1. Go into the “C:\Program Files\Rational\ClearCase\lib\mgrs”
    folder.
  2. Create a backup of the file named “map”.
  3. Edit “map” and edit the following lines to point to Beyond
    Compare:
    text_file_delta compare C:\Program Files\Beyond Compare 3\BComp.exetext_file_delta xcompare C:\Program Files\Beyond Compare 3\BComp.exetext_file_delta merge C:\Program Files\Beyond Compare 3\BComp.exetext_file_delta xmerge C:\Program Files\Beyond Compare 3\BComp.exe

Make the same change to lines beginning with _html, _xml, _html2,
_xml2 to use Beyond Compare for HTML and XML comparisons.

To use Beyond Compare 2, only change the xcompare line of the map
file.  Overriding compare, merge, and xmerge is not supported.  A
helper that improves BC2’s support is available
here.


版本调整系统VCS)日常作为单身应用程序运转,但版本调节也置于在各体系型的软件中,如文字管理器和电子手表格,合作Web文书档案\[2\]以及各种内容管理系统,例如维基百科的页面历史。版本控制允许恢复文件到以前的版本,这是编辑人员跟踪对方的编辑,纠正错误,并抵御破坏和批判的能力,垃圾邮件的维基。

Git是一个开源的分布式版本调控系统,能够有效、高速的管理从十分的小到足够大的档期的顺序版本管理。
Git 是 Linus Torvalds 为了帮扶管理 Linux
内核开辟而支付的叁个开放源码的版本调节软件。

Code Co-op

Visit Reliable Software for
details on using Beyond Compare with Code Co-op.  Reliable Software
offers a discounted bundle
of the two products.


在Computer软件工程中,修订调整是追踪和操纵源代码改动的别的类型的举行。软件开辟人士不时会利用修订调节软件来维护文书档案和布置文件以及源代码。

安装 Git
sudo apt-get update
sudo apt-get install git
CS-RCS
  1. Choose Settings from the Document Explorer’s Project menu.
  2. Switch to the File Types tab.
  3. Click the Default button.
  4. Change the Difference Analysis Tool to “Custom Tool”.
  5. Enter the path to BComp.exe in the Difference Analysis Tool
    edit.

当组织设计,开荒和配备软件时,经常会将一样软件的四个本子安顿在区别的站点中,并使软件开垦职员同期管理更新。软件的一无所长或特色平日仅出现在少数版本中(因为一些难题的修复以及程序开拓时引进的别样标题)。因而,出于稳固和修补错误的指标,能够寻觅和周转区别版本的软件以明确难题产生在哪些版本中是人命关天的。恐怕还亟需同不日常间费用多个版本的软件:比方,叁个本子修复了错误,但不曾新功用,而另八个本子是管理新效用的地方。

读书 Git 须要理解的定义
  • Repositorie(仓库)
  • Branch(分支)
  • Stage(暂存区)
CVS

CVS does not support external diff or merge tools.


在最简便的层面上,开垦人员能够省略地保存程序的两样版本的两个别本,并适用地方统一标准记它们。这种总结的措施已经在无数大型软件项目中央银行使。即便这种模式有效,但鉴于必得保险广大差相当的少等同的主次别本,由此效用极低。这供给开垦职员举行多量约束,何况不常会招致错误。由于代码库是同样的,它还亟需向一组开采人士授予读写试行权限,这增加了管理权限的人手的下压力,那样代码库就不会面前际遇祸害,那扩充了越多的复杂性。因而,开采了一部分自动化部分或任何修订调节进程的种类。那确定保证了版本调节步骤的好多管理掩盖在偷偷。

新建三个 Git 仓库及联合到长途酒店的步子
  1. mkdir learngit
    cd learngit
    git init
    新建多个文书夹并开始化为 git 商旅
  2. learngit文本夹内增加并编写四个file,如readme.md
  3. git status
    翻开当前专门的学问区,你会发掘有的法国红的字,像这么

    金沙国际官网 4

  4. git add readme.md
    将修改的文书移到暂存区

    金沙国际官网 5

  5. git commit -m 'add readme'
    将修改记录提交至多少个版本

    金沙国际官网 6

`1e59a48`是这次`commit`的hash
id,若之后有修改,想回退到这次提交上,可通过`git reset --hard 1e59a48`实现,详情参照[廖雪峰的Git教程](https://link.jianshu.com?t=http://www.liaoxuefeng.com/wiki/0013739516305929606dd18361248578c67b8067c8c017b000/0013744142037508cf42e51debf49668810645e02887691000)
  1. git push
    本条操作是将本地的旅舍同步到长途Github的货仓,可是供给您有Github账号并有三个对应的中距离仓库,那么先加多远程饭馆。
  2. 在Github官方网站(开源无需付费)注册一个账户,并新建一个储藏室,走入到库房,点击铁锈棕button复制仓库地址

    金沙国际官网 7

    到地头的酒馆下,
    git remote add origin https://github.com/Yvette14/Yvette.git
    其一是自我远程货仓的地方,通过此操作,就可以push你的代码到长途饭馆了

  3. 复制的长距离酒店地址假设https,则必要在该地输入你的github账号和密码,若想省略此步骤,可为你的计算机配置ssh.详情

上述手续只是git操作中的冰山一角,当你真正使用git开拓团队项目,你才会意识
git 的强劲。

金沙国际官网 8

财富与工具

  • 韩亦乐同学写的git入门文书档案:
    http://www.jianshu.com/p/b238de250c06,
    有标题可以与
    @icorvoh
    交流
  • 录制教程《版本调控入门 – 搬进 Github》:
    http://www.imooc.com/learn/390
  • 胡皓提供的Git学习财富指南:
    https://github.com/iamcoach/git
  • Git简明指南:http://rogerdudler.github.io/git-guide/index.zh.html
  • 免费的git书箱 progit2:
    https://www.gitbook.com/book/bingohuang/progit2/details,点击
    Download PDF开关下载
  • git常用命令手册:https://bbs.excellence-girls.org/topic/166
  • 廖雪峰的git在线教程:
    http://www.liaoxuefeng.com/wiki/0013739516305929606dd18361248578c67b8067c8c017b000
  • 在线尝试git:
    https://try.github.io/,
    粤语翻译在此处:
    http://blog.csdn.net/u011109881/article/details/51447500
  • Git学习能源聚集:http://www.jianshu.com/p/55496ff224e9
Dimensions CM / PVCS

金沙国际官网 9 BC version 3:

  1. Navigate to the Dimensions / PVCS install folder and find the file
    pvcsmerge.exe and rename it to pvcsmerge.exe.exe.
  2. Copy bcomp.exe from C:\Program Files\Beyond Compare 3 into the
    Dimensions folder and rename it to pvcsmerge.exe.

In Dimensions CM 10 you can edit your 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.

金沙国际官网 10 BC version 2:

Follow the instructions above, but instead of using BComp.exe use the
copy of pvcsmerge.exe in
pvcsmergev8.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.


修订调整还能追踪配置文件的更改,比方日常存款和储蓄在Unix系统中/etc/usr/local/etc上的系统。那为系统一管理理员提供了另一种轻便追踪所做改变的措施,以及在须求时回滚到中期版本的艺术

FreeVCS
  1. Choose Properties in the Project Manager’s Options menu.
  2. Switch to the Compare Tools panel.
  3. Click the Add Custom button.
  4. Enter “Beyond Compare” as the new name.
  5. Click the Edit button.
  6. Enter the path to BComp.exe in the File compare utility edit.
  7. Enter %1 %2 in the Command line parameter string edit.

结构:

git

Diff

  1. Create a shell script file “git-diff-wrapper.sh” with the following
    content:
    #!/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
  2. In a console window enter the command:
    $ git config --global diff.external <path_to_wrapper_script>

3-Way Merge (v3 Pro)

In a console window enter the following three commands:
$ git config --global merge.tool bc3  $ git config --global mergetool.bc3.cmd "`which bcompare` '\$LOCAL'    '\$REMOTE' '\$BASE' '\$MERGED'"  $ git config --global mergetool.bc3.trustExitCode true

2-Way Merge (v3 Std, v2)

In a console window enter the following three commands:
$ git config --global merge.tool bc3  $ git config --global mergetool.bc3.cmd "`which bcompare` '\$LOCAL'    '\$REMOTE' -savetarget='\$MERGED'"  $ git config --global mergetool.bc3.trustExitCode true


版本调控管理一组数据随时间的变型。这一个生成能够以各个措施构建。

Microsoft Team Foundation Server

Diff

  1. In Visual Studio Choose Options from the File menu.
  2. Expand Source Control in the treeview.
  3. Click Visual Studio Team Foundation Server in the treeview.
  4. Click the Configure User Tools button.
  5. Click the Add button.
  6. Enter “.*” in the Extension edit.
  7. Choose Compare in the Operation combobox.
  8. Enter the path to BComp.exe in the Command edit.
  9. In the Arguments edit, use:
    %1 %2 /title1=%6 /title2=%7

3-Way Merge (v3 Pro)

  1. Follow steps 1-6 above.
  2. Choose Merge in the Operation combobox.
  3. Enter the path to BComp.exe in the Command edit.
  4. In the Arguments edit, use:
    %1 %2 %3 %4 /title1=%6 /title2=%7 /title3=%8 /title4=%9

2-Way Merge (v3 Std, v2)

Use the same steps as the 3-way merge above, but use the command line:
%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.

  1. Open Visual Studio 2005.
  2. Select Options from the Tools menu.
  3. Select Plug-In Settings under the Source Control branch of
    the left-side tree control.
  4. Select Visual SourceSafe under Plug-In Settings on the
    right-hand pane.
  5. Press the Advanced button.
  6. Select the Custom Editor tab in the “SourceSafe Options” pane.
  7. Select File Difference in the Operation drop-down.
  8. Enter “.*” in the File Extension edit.
  9. Enter this in the Command Line edit:
    "C:\Program Files\Beyond Compare 3\bcomp.exe" %1 %2
  10. Click the Add button and close all dialog boxes.

当修改受版本调节的数目时,在经过签出寻觅之后那常常不会立刻反映在修订控制连串中(在仓库储存库中),而是必须检入提交。修订调控之外的副本称为“工作别本”。举二个简便的例子,编辑Computer文件时,编辑程序存款和储蓄在内存中的数据是职业副本,通过保留提交。具体地说,能够打字与印刷出文书档案,手动编辑,然后稍后手动将改成输入计算机并保存。对于源代码调整,工作副本是一定修订版中有所文件的副本,日常存款和储蓄在开辟职员的计算机本地;\[注1\]在这种情况下,保存文件只会更改工作副本,并且检查存储库是一个单独的步骤。

MKS Source Integrity

Diff

  1. Start MKS Source Integrity.
  2. Go to Tools | Preferences | DiffTool.
  3. Select Custom Command.
  4. Enter the command:
    "C:\Program Files\Beyond Compare 3\BComp.exe" /title1="{1}" /title2="{2}" "{3}" "{4}"

3-Way Merge (v3 Pro)

Use this for the merge tool command line:
"C:\Program Files\Beyond Compare 3\BComp.exe" /title1="{1}" /title2="{2}" /title3="{0}" "{5}" "{6}" "{4}" "{7}"

2-Way Merge (v3 Std, v2)

Use this for the merge tool command line:
"C:\Program Files\Beyond Compare 3\BComp.exe" /title1="{1}" /title2="{2}" "{5}" "{6}" /savetarget="{7}"


只要五人正在管理单个数据集或文书档案,则它们隐式地创建数量的分段,因而出现合併难题,如下所述。对于简易的搭档文书档案编辑,能够透过动用文件锁定或简捷地幸免管理别的人正在管理的一律文书档案来防御这种境况。

Perforce

P4V (The Perforce Visual Client)

  1. Choose Preferences… from the Edit menu.
  2. Switch to the Diff tab.
  3. Change the Default Diff Application option to “Other
    application”.
  4. Enter the path to BComp.exe in the Location edit.
  5. Switch to the Merge tab.
  6. Change the Default merge application to “Other application”.
  7. Enter the path to BComp.exe in the Location edit.
  8. In the Arguments edit, enter:
    %1 %2 %b %r /lefttitle="%T" /righttitle="%Y"

修订调整连串常常是汇总的,具备单个权威数据存款和储蓄,存储库以及参照此大旨存款和储蓄库实现的检出和签入。大概,在布满式版本调整中,未有单个存款和储蓄库具备权威性,能够检出数据并将其签入任何存款和储蓄库。当检入不一致的积累库时,那被解释为统一或补丁。

QVCS
  1. Choose Preferences from the Admin menu.
  2. Switch to the Utilities tab.
  3. Enter the path to BComp.exe in the Visual Compare Utility Command
    Line
    edit, followed by “%s” “%s”.  For example:
    C:\Progra~1\Beyond~1\BComp.exe "%s" "%s"

Roundtable TSMS
  1. Go into the “C:\Program Files\RoundTable\rtb\p” folder.
  2. Create a backup of the file named “Rtb_vcom.p”.
  3. Edit “Rtb_vcom.p” and change the line:
    ASSIGN Mexe = SEARCH("visdiff/visdiff.exe").
    to:
    ASSIGN Mexe = SEARCH("C:\Progra~1\Beyond~1\bcomp.exe").

SourceAnyWhere for VSS
  1. Select Tools | Options. Go to the External Programs tab.
  2. Application for diff/merge:
    c:\program files\beyond compare 3\bcomp.exe
  3. Arguments for diff files:
    /readonly /title1="%FIRST_LABEL%" /title2="%SECOND_LABEL%" "%FIRST_FILE%" "%SECOND_FILE%"
  4. Arguments for diff folders:
    "%FIRST_DIR%" "%SECOND_DIR%"
  5. Arguments for Two-way merge:
    /leftreadonly /title1="%FIRST_LABEL%" /title2="%SECOND_LABEL%" "%FIRST_FILE%" "%SECOND_FILE%"

SourceOffsite
  1. Choose Options from the Windows Client’s Tools menu.
  2. Switch to the External Programs panel.
  3. Enter the path to BComp.exe in the Application for comparing
    files
    , Application for comparing folders and Application for
    merging files
    edits.

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

Diff

  1. Choose Personal Options from the Tools menu.
  2. Switch to the Files panel.
  3. If it’s present, click the “Alternate Applications…” button.
  4. Check the Comparison Utility checkbox.
  5. Enter the path to BComp.exe in the edit.
  6. In the Options edit enter:
    $file1 $file2

3-Way Merge (v3 Pro)

  1. Follow steps 1-5 above, but check the Merge Utility checkbox in
    step 4.
  2. In the Options edit enter:
    $usertip $branchtip $basefile /mergeoutput=$resultfile

2-Way Merge (v3 Std, v2)

Use the same steps as the 3-way merge above, but use the options:
$usertip $branchtip /savetarget=$resultfile


Subversion

Windows

  1. Go into the Beyond Compare installation folder (eg, C:\Program
    Files\Beyond Compare 3).
  2. Create a batch file named “svn.bat” with one line:
    "C:\Progra~1\Beyond~1\bcomp.exe" "%6" /title1=%3 "%7" /title2=%5
  3. Go into Subversion’s per-user configuration area, typically
    C:\Documents and Settings\<username>\Application
    Data\Subversion.
  4. Edit “config” and change the following lines:
    # [helpers]
    # diff-cmd = diff_program (diff, gdiff, etc.)
    to:
    [helpers]
    diff-cmd = C:\Progra~1\Beyond~1\svn.bat

Cygwin ()

Instead of using a batch file, create a file named “bc.sh” with the
following line:
"$(cygpath 'C:\Progra~1\Beyond~1\bcomp.exe')" `cygpath -w "$6"` `cygpath -w "$7"` /title1="$3" /title2="$5" /readonly

Linux

Diff:

Create a file named /usr/bin/bcdiff.sh with the following line:
/usr/bin/bcompare "$6" "$7" -title1="$3" -title2="$5" -readonly

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:
/usr/bin/bcompare "$2" "$3" "$1" $4"

Edit “$HOME/.subversion/config” and add the line “merge-tool-cmd =
/usr/bin/bcmerge.sh”.


Surround SCM
  1. Open User Options.
  2. Go to the Diff/Merge section.
  3. Add or edit an entry for File Type “All other text files”, with
    Diff/Merge set to Diff.
  4. Enter selected application: “c:\program files\beyond compare
    3\bcomp.exe” “%1” “%2” and click OK.

Team Coherence
  1. Choose Options from the Tools menu.
  2. Switch to the Difference Viewers tab.
  3. Enter the path to BComp.exe in the Application edit.
  4. Enter /fv “$LF” /title1=”$LD” “$RF” /title2=”$RD” in the
    Parameters edit.

Telelogic Synergy
  1. Close CMSynergy application.
  2. Go into your %userprofile% folder (type %userprofile% in explorer
    address bar if you are unsure where this is ).
  3. Create a backup of the file named “ccm.ini”.
  4. Edit “ccm.ini” and change the lines for Compare_cmd and merge_cmd
    to:
    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
  1. Start Preferences application.
  2. Switch to the Tools tab.
  3. Enter the path to BComp.exe in the External diff application
    edit.
  4. Check the External diff application supports Unicode checkbox.

TortoiseHg

To configure TortoiseHg you need to edit the file
%USERPROFILE%\Mercurial.ini. Add the following lines, using existing
INI sections if they already exist:

Diff

[extdiff]  cmd.bcomp = C:\Program Files\Beyond Compare 3\BCompare.exe  opts.bcomp = /ro  [tortoisehg]  vdiff = bcomp

3-Way Merge (v3 Pro)

[merge-tools]  bcomp.executable = C:\Program Files\Beyond Compare 3\BComp  bcomp.args = $local $other $base $output  bcomp.priority = 1  [ui]  merge = bcomp


TortoiseSVN

Diff

  1. Select Settings from Explorer’s TortoiseSVN submenu.
  2. Switch to the Diff Viewer tab.
  3. Change the radio buttons from TortoiseMerge to External.
  4. In the path edits, enter:
    "C:\Program Files\Beyond Compare 3\BComp.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly

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 the Diff Viewer
tab and add each image type’s extension with the same command line as
above.

3-Way Merge (v3 Pro)

  1. Select Settings from Explorer’s TortoisSVN submenu.
  2. Switch to the Merge Tool tab.
  3. Change the radio buttons from TortoiseMerge to External.
  4. In the path edits, enter:
    "C:\Program Files\Beyond Compare 3\BComp.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname

2-Way Merge (v3 Std, v2)

Use the same steps as above, but use the command line:
"C:\Program Files\Beyond Compare 3\BComp.exe" %mine %theirs /mergeoutput=%merged


SourceGear Vault / Fortress

Diff

  1. Choose Options from the Tools menu.
  2. Select Diff / Merge.
  3. Under Diff, enter the path to BComp.exe for the Program setting.
  4. In the Arguments edit, enter:
    "%LEFT_PATH%" "%RIGHT_PATH%" /ro /title1="%LEFT_LABEL%" /title2="%RIGHT_LABEL%"

3-Way Merge (v3 Pro)

  1. Choose Options from the Tools menu.
  2. Select Diff / Merge.
  3. Under Merge, enter the path to BComp.exe for the Program
    setting.
  4. In the Arguments edit, enter:
    "%WORKING_PATH%" "%OTHER_PATH%" "%BASELINE_PATH%" "%DEST_PATH%" /title1="%WORKING_LABEL%" /title2="%OTHER_LABEL%" /title4="%DEST_LABEL%"

2-Way Merge (v3 Std, v2)

Use the same steps as above, but set the Arguments setting to:
"%WORKING_PATH%" "%OTHER_PATH%" /title1="%WORKING_LABEL%" /title2="%OTHER_LABEL%" /savetarget="%DEST_PATH%"


VersionMaster
  1. Choose User Specific Options from the Tools | Options
    submenu.
  2. Switch to the Visual Differencing tab.
  3. Change the radio button to Use Custom Visual Differencer.
  4. Enter the path to BComp.exe in the edit.

Visual SourceSafe 2005

Diff

  1. Open the Visual SourceSafe Explorer.
  2. Select Options from the Tools menu.
  3. Switch to the Custom Editors tab in the SourceSafe Options
    dialog.
  4. Select File Difference in the Operation drop-down.
  5. Enter “.*” in the File Extension edit.
  6. Enter this in the Command Line: edit:
    "C:\Program Files\Beyond Compare 3\bcomp.exe" %1 %2
  7. Click the Add button.

Merge

  1. Open the Visual SourceSafe Explorer.
  2. Select Options from the Tools menu.
  3. Switch to the Custom Editors tab in the SourceSafe Options
    dialog.
  4. Select File Merge in the Operation drop-down.
  5. Enter “.*” in the File Extension edit.
  6. Enter this in the Command Line edit:
    "C:\Program Files\Beyond Compare 3\bcomp.exe" %1 %2 /savetarget=%4
  7. Click the Add button.

Visual SourceSafe 6.0 and earlier do not support external difference
utilities.  SourceOffsite and VersionMaster can both use Beyond Compare
in combination with SourceSafe.


WinCVS
  1. Choose Preferences from the Admin menu.
  2. Switch to the WinCVS tab.
  3. Check the External diff checkbox.
  4. Enter the path to BComp.exe in the External diff edit.

 

Source Link:

发表评论

电子邮件地址不会被公开。 必填项已用*标注

网站地图xml地图