I am new to using svn and through a misunderstanding issued the
following sequence of commands in a working copy directory (were
`Makefile' is under revision control):
$ rm Makefile
$ svn copy file://$HOME/svnrep/trunk/p2phub/Makefile .
subversion/libsvn_wc/log.c:294: (apr_err=155009)
svn: Problem running log
svn: in directory ''
subversion/libsvn_wc/log.c:1179: (apr_err=155009)
svn: start_handler: error processing command 'modify-entry' in ''
subversion/libsvn_wc/log.c:518: (apr_err=155009)
svn: error merge_syncing entry 'Makefile'
subversion/libsvn_wc/entries.c:1409: (apr_err=155013)
svn: Unmergeable scheduling requested on an entry
svn: fold_state_changes: Entry 'Makefile' already under revision control
-- Seeing the wrongness of my ways I tried
$ svn update Makefile
svn: Attempted to lock an already-locked dir
svn: working copy locked: .
svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for
details)
$ svn cleanup
subversion/libsvn_wc/log.c:294: (apr_err=155009)
svn: Problem running log
svn: in directory ''
subversion/libsvn_wc/log.c:1179: (apr_err=155009)
svn: start_handler: error processing command 'modify-entry' in ''
subversion/libsvn_wc/log.c:518: (apr_err=155009)
svn: error merge_syncing entry 'Makefile'
subversion/libsvn_wc/entries.c:1409: (apr_err=155013)
svn: Unmergeable scheduling requested on an entry
svn: fold_state_changes: Entry 'Makefile' already under revision control
$ svn update Makefile
svn: Attempted to lock an already-locked dir
svn: working copy locked: .
svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)
So the WC is locked and cleanup does not help. I removed the WC and
checked out a new one which solved the problem.
Obviously the copy command did not make any sense in the first place
but I think svn should recover gracefully and keep the WC intact.
This was with svn version 0.30.0.
--
Markus
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Sep 27 11:17:05 2003