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

svn_wc_merge() returned an unexpected error

From: Sebastian Bergmann <lists_at_sebastian-bergmann.de>
Date: 2002-07-13 07:42:34 CEST

  Following error occured this morning when I updated with a build from
  last night:

svn_error: #21046 : <Problem running log>
  in directory ./subversion/libsvn_fs

svn_error: #21046 : <Problem running log>
  start_handler: error processing command 'merge' in

svn_error: #21089 : <Error calling external program>
  svn_wc_merge() returned an unexpected error

svn_error: #21089 : <Error calling external program>
  svn_io_run_diff3: Error running
c:\progra~1\cygnus\cygwin\bin\diff3.exe: exit
code was 2, args were:
in directory ., basenames:

  Sebastian Bergmann
  http://sebastian-bergmann.de/                 http://phpOpenTracker.de/
  Did I help you? Consider a gift: http://wishlist.sebastian-bergmann.de/
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Jul 13 07:43:55 2002

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.