Using Beyond Compare with Version Control Systems under OSX
2015-05-11 15:52
886 查看
Beyond Compare can be configured as the external difference utility in many popular VCS applications. The following are configuration instructions submitted by our users. Let us know if you have one to add to the list.
Index:
Cornerstone SVN Git IntelliJ
IDEA 12 Mercurial 2.4.2 Perforce SourceTree Syncovery
Mac Tower (Git)
In Cornerstone, you can specify a custom external compare script.
1) Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools
Create an AppleScript wrapper for use by Cornerstone:
Set in Preferences | General | External compare tool | Other
Script...
(Note: Use
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
In a terminal:
To launch a diff using Beyond Compare, use the command "git difftool file.ext".
In a terminal:
To launch a 3-way merge using Beyond Compare, use the command "git mergetool file.ext"
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
Add the following lines to
To launch a diff in Beyond Compare, use
To launch a merge in Beyond Compare, use
The first step is to launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools
In IntelliJ's Settings dialog, under IDE Settings, select the External Diff Tools section:
Compare folders
Path to executable: /usr/local/bin/bcomp
Compare files
Path to executable: /usr/local/bin/bcomp
Merge tool
Path to executable: /usr/local/bin/bcomp
Parameters: %1 %3 %2 %4
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools
In the Perforce Preferences dialog, go to the Diff section and select Other application.
Set Location to
From the Beyond Compare menu, Install Command Line Tools. Then:
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools
Create a file named
Edit
Create a file named
Edit
The first step is to launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools
Then to configure Syncovery:
Select menu Syncovery/Preferences...
Click the Misc tab
In the field Program used to compare files from the Sync Preview, write
Command Line Tools)
Click Close
(Requires Tower 2.0.5 or newer)
Open Tower's preferences dialog on the Git Config Tab.
Set the Diff Tool drop-down to Beyond Compare
Set the Merge tool drop-down to Beyond Compare
Index:
Cornerstone SVN Git IntelliJ
IDEA 12 Mercurial 2.4.2 Perforce SourceTree Syncovery
Mac Tower (Git)
CORNERSTONE
SVN
In Cornerstone, you can specify a custom external compare script.1) Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools
DIFF
Create an AppleScript wrapper for use by Cornerstone:-- Cornerstone executes the script as: -- /path/to/tool <original> <modified> -- on run argv do shell script "/usr/local/bin/bcomp \"" & item 1 of argv & "\" \"" & item 2 of argv & "\"" end run
Set in Preferences | General | External compare tool | Other
Script...
GIT
Git 2.3 and newer
(Note: Use bc3on the command line for BC version 4. Caused by git legacy support from Linux.)
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.
Diff
In a terminal:git config --global diff.tool bc3
To launch a diff using Beyond Compare, use the command "git difftool file.ext".
Merge
In a terminal:git config --global merge.tool bc3 git config --global mergetool.bc3 trustExitCode true
To launch a 3-way merge using Beyond Compare, use the command "git mergetool file.ext"
Older versions of Git
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.Add the following lines to
$HOME/.gitconfig:
[diff] tool = bcomp [difftool] prompt = false [difftool "bcomp"] trustExitCode = true cmd = "/usr/local/bin/bcomp" \"$LOCAL\" \"$REMOTE\" [merge] tool = bcomp [mergetool] prompt = false [mergetool "bcomp"] trustExitCode = true cmd = "/usr/local/bin/bcomp" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
To launch a diff in Beyond Compare, use
git difftool file.ext.
To launch a merge in Beyond Compare, use
git mergetool file.ext.
INTELLIJ
IDEA 12
(Potentially, also RubyMine, Webstorm, PyCharm, PhpStorm)
The first step is to launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line ToolsIn IntelliJ's Settings dialog, under IDE Settings, select the External Diff Tools section:
Compare folders
Path to executable: /usr/local/bin/bcomp
Compare files
Path to executable: /usr/local/bin/bcomp
Merge tool
Path to executable: /usr/local/bin/bcomp
Parameters: %1 %3 %2 %4
MERCURIAL
2.4.2
[ui] merge = bcomp [extensions] extdiff = [extdiff] cmd.bcomp = /usr/local/bin/bcomp #opts.bcomp = -ro [merge-tools] bcomp.executable = /usr/local/bin/bcomp bcomp.args = $local $other $base $output bcomp.priority = 1 bcomp.premerge = True bcomp.gui = True
PERFORCE
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line ToolsIn the Perforce Preferences dialog, go to the Diff section and select Other application.
Set Location to
/usr/local/bin/bcompand Arguments to
%1 %2
SOURCETREE
From the Beyond Compare menu, Install Command Line Tools. Then:Visual Diff Tool: Other Diff Command:/usr/local/bin/bcomp Parameters:-ro $LOCAL $REMOTE Merge Tool: Other Merge Command:/usr/local/bin/bcomp Parameters:$LOCAL $REMOTE $BASE $MERGED
SUBVERSION
Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools
Diff
Create a file named /usr/bin/bcdiff.shand allow execute permissions (chmod +x). Add the following lines:
/usr/bin/bcomp "$6" "$7" -title1="$3" -title2="$5" -readonly exit 0
Edit
$HOME/.subversion/configand add the line
diff-cmd = /usr/bin/bcdiff.shin [Helpers].
Merge
Create a file named /usr/bin/bcmerge.shand allow execute permissions (chmod +x). Add the following line:
/usr/bin/bcomp "$2" "$3" "$1" "$4"
Edit
$HOME/.subversion/configand add the line
merge-tool-cmd = /usr/bin/bcmerge.shin [Helpers].
SYNCOVERY
MAC
The first step is to launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line ToolsThen to configure Syncovery:
Select menu Syncovery/Preferences...
Click the Misc tab
In the field Program used to compare files from the Sync Preview, write
/usr/local/bin/bcompare(or the pathname given when using BC4's Install
Command Line Tools)
Click Close
TOWER
(GIT)
(Requires Tower 2.0.5 or newer)Open Tower's preferences dialog on the Git Config Tab.
Set the Diff Tool drop-down to Beyond Compare
Set the Merge tool drop-down to Beyond Compare
相关文章推荐
- Using Beyond Compare with Version Control Systems
- Using Beyond Compare with Version Control Systems
- Using Beyond Compare with Version Control Systems
- Using Beyond Compare with Version Control Systems(ZZ)
- Using External Version Control Systems with Unity【使用第三方版本控制工具】
- Using Beyond Compare with TFS
- Using Beyond Compare with TFS
- Using Beyond Compare with TFS
- Using Version Control with Unity
- 项目管理实践【五】自动编译和发布网站【Using Visual Studio with Source Control System to build and publish website automatically】
- Unzip 6.0 fails to compile under 64-bit systems with the instructions in the book
- SVN:is already under version control 错误解决
- 项目管理实践六、自动同步数据库【Using Visual Studio with Source Control Sys
- FFMpeg & x264 compile for using with Android NDK on Mac OSX
- 【ProjectT】Pragmatic Version Control Using CVS
- svn:is not under version control and
- Agile-version-control-with-multiple-teams
- svn is already under version control
- Beyond Compare integrate with WinSCP & CVS
- 项目管理实践【五】自动编译和发布网站【Using Visual Studio with Source Control System to build and publish website automatically】