Re: update problem

On Fri, Jun 14, 2002 at 04:51:54AM +0200, Paul Marculescu wrote:
>
> D:\svntest\wc2>svn up
>
> svn_error: #21043 : <Problem running log>
> in directory .
>
> svn_error: #21043 : <Problem running log>
> start_handler: error processing command 'merge' in .
>
> svn_error: #21085 : <Error calling external program>
> svn_wc_merge() returned an unexpected error
>
> svn_error: #21085 : <Error calling external program>
> Error running c:\progra~1\cygnus\cygwin\bin\diff3.exe: exitcode was
> 2, args were:
> in directory ., basenames:
> file1.cpp.62692.00001.tmp
> file1.cpp.62584.00001.tmp
> file1.cpp.62588.00001.tmp

there was a recent thread with similar errors on windows. it is
likely that diff3.exe is trying to run diff.exe, but it can't find it
because it is not in your path and the version of diff3.exe you have
doesn't support the command line argument that we use to tell it where
diff.exe is. check to see if diff.exe is in your path, and if it
isn't, add it and see if that helps.

-garrett

-- 
garrett rooney                    Remember, any design flaw you're 
rooneg@electricjellyfish.net      sufficiently snide about becomes  
http://electricjellyfish.net/     a feature.       -- Dan Sugalski
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org