尝试用下面两种方法
- svn clean up 中有一个选项break lock勾选上
- 把对应的文件来里的.svn里面的lock文件删除。
svn local delete, incoming delete upon update 解决办法
# 1.In your working directory, recreate that conflicting file:
$ touch foo
# 2.Revert that file to the state SVN likes (that means deleted):
// 如果是目录的话、
// svn revert --depth infinity foo/
$ svn revert foo
# 3.Now delete that file:
$ rm foo
# 4.Conflict resolved:
$ svn st
# Done.