From 7.5 of the manual:
http://svnbook.red-bean.com/nightly/en/svn.advanced.externaldifftools.html
I created diff3wrap.bat:
@ECHO OFF
REM Configure your favorite diff3/merge program here.
SET DIFF3="C:\Program Files\KDiff3\kdiff3.exe"
REM Subversion provides the paths we need as the ninth, tenth, and eleventh
REM parameters. But we only have access to nine parameters at a time, so we
REM shift our nine-parameter window twice to let us get to what we need.
SET MINE=%7
SET OLDER=%6
SET YOURS=%8
REM Call the merge command (change the following line to make sense for
REM your merge program).
%DIFF3% %OLDER% %MINE% %YOURS%
REM After performing the merge, this script needs to print the contents
REM of the merged file to stdout. Do that in whatever way you see fit.
REM Return an errorcode of 0 on successful merge, 1 if unresolved conflicts
REM remain in the result. Any other errorcode will be treated as fatal.
And called it will
svn diff --diff-cmd c:\bin\diff3wrap.bat
and it worked for me.
- kev
On 2/13/07, Nick Stolwijk <nick_stolwijk@planet.nl> wrote:
>
> Has somebody used kdiff3 under windows with Subversion?
>
> We tried to supply it through the --diff3-cmd parameter of subversion,
> but I guess the parameters are in the wrong order.
>
> Does someone has a script file to use kdiff3 or recommend another diff3
> tool for windows.
>
> Thanks in advance,
>
> Nick Stolwijk
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
Received on Wed Feb 14 01:12:24 2007