update & cleanup cannot run log

I just tried to svn update from rev 3082 to revision 3085 in my
Windows svn build area and I got the following errors:

$ svn update
svn: Problem running log
svn: in directory .
svn: start_handler: error processing command 'merge' in .
svn: Working copy not locked
svn: svn_wc_merge() returned an unexpected error
svn: directory not locked ()

bzajac@TUG-BOAT /d/Blair/Code/Subversion/svn
$ svn cleanup
svn: Problem running log
svn: in directory .
svn: start_handler: error processing command 'merge' in .
svn: Working copy not locked
svn: svn_wc_merge() returned an unexpected error
svn: directory not locked ()

This is reproducable on Unix also with revision 3080.

Here's how to reproduce it:

% cd svn
% svn update -r 3082
% vi win-tests.py
  [change the lin "shell = 'C:PROGR....' line]
% svn update

I can't cleanup the directory, nor revert win-tests.py.

Any ideas?

Best,
Blair

-- 
Blair Zajac <blair@orcaware.com>
Web and OS performance plots - http://www.orcaware.com/orca/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org