[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

diff3 error

From: <rctalkov_at_appworx.com>
Date: 2003-01-23 05:20:18 CET

I am just starting to try out Subversion.
When I try a commit where a merge is necessary I get an error on diff3,
this happens whether I use the cygwin or the subversion diff3. I tried to do
a cleanup and got the same error.here is the error:

svn cleanup .
svn: Problem running log
svn: in directory
svn: start_handler: error processing command 'merge' in
svn: Error calling external program
svn: svn_io_run_diff3: Error running d:\Program
Files\Subversion\helpers\cygdiff
\diff3.exe: exitcode was 2, args were:
in directory ., basenames:
RemoteFile.java.63556.00003.tmp
RemoteFile.java.63556.00003.tmp.63592.00001.tmp
RemoteFile.java.63556.00003.tmp.63588.00001.tmp

Roger Talkov

rtalkov@appworx.com
425-644-2121 x135
Received on Sat Oct 14 02:08:46 2006

This is an archived mail posted to the Subversion Dev mailing list.