update problem

I'm trying to make a svn up which will should result in a conflict, but
I receive the following errors:

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

If I run svn cleanup afterwards, it outputs the same thing.

Anyway, I'm using quite a bit old revision for svn (1868).
Should I make an update to subversion and recompile or the problem is
somewhere else?

Thanks.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 14 03:51:55 2002