SUBVERSION
Windows
Diff
- Go into the Beyond Compare installation folder (eg,
C:\Program Files (x86)\Beyond Compare 4
). - Create a batch file named "bc4svn.bat" containing:
call "%~dp0\bcomp.exe" "%6" /title1=%3 "%7" /title2=%5
IF %errorlevel%==0 goto ZERO
EXIT /B 1
:ZERO
EXIT /B 0 - Go into Subversion's per-user configuration area, typically
C:\Users\username\AppData\Roaming\Subversion
. - Edit "config" and change the following lines:
# [helpers]
# diff-cmd = diff_program (diff, gdiff, etc.)
to:[helpers]
diff-cmd = "C:\Program Files (x86)\Beyond Compare 4\bc4svn.bat"
Merge
- Go into the Beyond Compare installation folder (eg,
C:\Program Files (x86)\Beyond Compare 4
). - Create a batch file named "bc4mer.bat" containing:
call "%~dp0\bcomp.exe" "%2" "%3" "%1" "%4"
IF %errorlevel%==0 goto ZERO
EXIT /B 1
:ZERO
EXIT /B 0 - Go into Subversion's per-user configuration area, typically
C:\Documents and Settings\<username>\Application Data\Subversion
. - Edit "config" and change the following lines:
# [helpers]
# merge-tool-cmd = merge_program
to:[helpers]
merge-tool-cmd = "C:\Program Files (x86)\Beyond Compare 4\bc4mer.bat"
"C:\myApp\Beyond Compare 4\BComp.exe" %base %mine /title1=%bname /title2=%yname /rightreadonly
"C:\myApp\Beyond Compare 4\BComp.exe" %base %mine /title1=%bname /title2=%yname /rightreadonly
원문>
http://www.scootersoftware.com/support.php?zz=kb_vcs