Working area problem after failed merge

Hi all,
I was trying to merge changes from a branch. The merge failed
because I was merging from the wrong directory. The next operation
I did (another attempted merge?) I got an error message that svn
couldn't lock the working area. (Sorry about the paraphrases, I
was using Tortoise).

Next I switched to command line, thus:

C:\software\unity\trunk>svn cleanup
svn: Write-lock stolen in 'core/modules/udb/kernel/bindings'

C:\software\unity\trunk>svn cleanup
svn: Can't open directory 'core/modules/udb/kernel/bindings/.svn/tmp': The
system cannot find the path specified.

C:\software\unity\trunk>svn up
svn: Working copy '.' locked
svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)

C:\software\unity\trunk>svn cleanup
svn: Can't open directory 'core/modules/udb/kernel/bindings/.svn/tmp': The
system cannot find the path specified.

Am I doing something stupid? How should I be recovering from this?

Thanks,
Jack

Server: 1.0.1 Linux
Client: 1.0.1 XP

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Apr 14 01:02:14 2004