Search code examples
svnlocked

My SVN Repository has locked me out!


I appear to be stuck in an infinite SVN loop, as it were...

My repository is located locally at /Users/Jack/MySite.co.uk/

The problem is, the .svn folder appears to have been accidentally deleted from /Users/Jack/MySite.co.uk/images/png, as such triggering the error svn: '/Users/Jack/Sites/MySite.co.uk/images/png' is not a working copy directory...

What I've tried doing is:

svn --force delete /Users/Jack/Sites/MySite.co.uk/images/png

Which says svn: Working copy '/Users/Jack/Sites/MySite.co.uk/images' locked. Run 'svn cleanup' to remove locks (type 'svn help cleanup' for details).

So, I follow the instructions and do this:

svn cleanup /Users/Jack/Sites/MySite.co.uk/

To which Subversion responds: '/Users/Jack/Sites/MySite.co.uk/images/png' is not a working copy directory

I apologise if that's confusing, but, I'm baffled too! Any easy way to fix this? I've tried svn adding the folder in question, to which it tells me /images/ is locked. Harumph!

Thanks,

Jack


Solution

  • Not confusing at all. It's actually a common problem. What you do is move that png directory off somewhere else, run an svn update to bring it back from the repository, and then copy any changes you've made from your saved location back into the directory.