Commit failed: already locked

Question

I just tried to add & commit about 25,000 files to VisualSVN using TortoiseSVN.

The commit dialog locked up (to be expected I guess), but after a while of the thread being blocked, I killed Tortoise, hoping to commit smaller chunks of files at a time.

Now I get this error:

Error: Commit failed (details follow):

Working copy 'C:\INTERNAL\Icons\Oxygen 4.10.1' locked.

'C:\INTERNAL\Icons\Oxygen 4.10.1\scalable\places\PaxHeaders.14455' is already locked

I've killed TortoiseProc.exe and restarted VisualSVN a couple of times, but I'm still getting the error.

I've also right-clicked the folder and chose Release lock, but I get:

There's nothing to unlock. No file has a lock in this working copy.

When I run svn st, I get a huge long output of all the files waiting to be added.

Even when I try to commit something unrelated (a couple of dirs up), I get the same error.

I am able to commit successfully to a separate repo on the same server.

How can I release the lock and commit these files?

Answer 1

Try doing a SVN Cleanup. I had the same issue and after doing that the locks cleared up.

Specifically from the Tortoise SVN Cleanup Documentation:

If a Subversion command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseSVN → Cleanup on the folder. It is a good idea to do this at the top level of the working copy.

In the cleanup dialog, there are also other useful options to get the working copy into a clean state.

Clean up working copy status As stated above, this option tries to get an inconsistent working copy into a workable and usable state. This doesn't affect any data you have but only the internal states of the working copy database. This is the actual Cleanup command you know from older TortoiseSVN clients or other SVN clients.

Here is a screenshot of the recommended SVN Cleanup options: