You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Sebastian Bergmann <li...@sebastian-bergmann.de> on 2002/07/13 05:42:34 UTC
svn_wc_merge() returned an unexpected error
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
./subversion/libsvn_fs
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:
./subversion/libsvn_fs/libsvn_fs.dsp.62692.00001.tmp
./subversion/libsvn_fs/libsvn_fs.dsp.62692.00001.tmp.62608.00001.tmp
./subversion/libsvn_fs/libsvn_fs.dsp.62692.00001.tmp.62612.00001.tmp
--
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
Re: svn_wc_merge() returned an unexpected error
Posted by Ben Collins-Sussman <su...@collab.net>.
Sebastian Bergmann <li...@sebastian-bergmann.de> writes:
> Sebastian Bergmann wrote:
> > Following error occured this morning when I updated with a build from
> > last night:
>
> After I deleted libsvn_fs.dsp and the temporary files, "svn up" gives
>
> Restored ./subversion/libsvn_fs/libsvn_fs.dsp
>
> svn_error: #21042 : <Attempted to lock an already-locked dir>
> working copy locked: ./subversion/libsvn_fs
'svn cleanup'
Yes, don't worry, we're covering this command in the Handbook. :-)
(Is it in the FAQ yet?)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn_wc_merge() returned an unexpected error
Posted by Sebastian Bergmann <li...@sebastian-bergmann.de>.
Sebastian Bergmann wrote:
> Following error occured this morning when I updated with a build from
> last night:
After I deleted libsvn_fs.dsp and the temporary files, "svn up" gives
Restored ./subversion/libsvn_fs/libsvn_fs.dsp
svn_error: #21042 : <Attempted to lock an already-locked dir>
working copy locked: ./subversion/libsvn_fs
--
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