Re: Problems with diff3 on win32

Ben Collins <bcollins@debian.org> writes:

> C:\dqse>\svn\svn cleanup /dqse
>
> svn_error: #21043 : <Problem running log>
> in directory /dqse
>
> svn_error: #21043 : <Problem running log>
> start_handler: error processing command 'merge' in /dqse
>
> svn_error: #21087 : <Error calling external program>
> svn_wc_merge() returned an unexpected error
>
> svn_error: #21087 : <Error calling external program>
> Error running c:\progra~1\cygnus\cygwin\bin\diff3.exe: exitcode was 2, args were:
> in directory /dqse, basenames:
> ui-source.dqs.63976.00001.tmp
> ui-source.dqs.63868.00001.tmp
> ui-source.dqs.63872.00001.tmp

"exitcode was 2" indicates that diff3 is starting but failing. Can you
run diff3 manually from the command line? Can you run it on the three
named files?

-- 
Philip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org