SVN 文件被我锁定,现在无法提交
场景:一个二进制文件需要一个 svn 锁才能修改.要修改,首先锁定、修改文件,然后在提交时使用取消"按钮取消提交.由于某种原因,删除了包含锁定文件的整个文件夹(包括 .svn 文件夹).
Scenario: An binary file needs a svn lock to modify. To modify, the file was first locked, modified, and then while committing, cancelled the commit using the "Cancel" button. Due to some reason, deleted the whole folder containing the locked file (including the .svn folder).
问题:我通过 tortoise svn 使用了SVN 更新".所有文件都更新了.但是之前被锁定的文件并没有用锁定符号表示锁定.尽管如此,我还是修改了文件并尝试提交.
Problem: I used "SVN update" through tortoise svn. All the files were updated. But the file which was locked previously does not indicate as locked with the lock symbol. Nevertheless, I modified the file and tried to commit.
提交时出错:
Server sent unexpected return value (423 Locked) in response to PUT request for '/****/!svn/wrk/9f89b6b6-7932-9f45-82e8-fafbd5426290/trunk/***'
当我尝试使用SVN Get Lock"再次获取锁时,它显示失败:
While I try to acquire the lock again using "SVN Get Lock" it fails showing:
尝试获取锁时出错:
.`...is already locked by user 'kr***' in filesystem '/data/svn/dir/***/repos/***/db'`
我的感觉是,客户端的锁信息丢失了,但服务器端仍然存在.
What I feel, is that the lock information on the client side is missing but still present on the server side.
请提出出路.
版本信息:TortoiseSVN 1.6.8, Build 19260 - 32 Bit , 2010/04/16 20:20:11
Version info: TortoiseSVN 1.6.8, Build 19260 - 32 Bit , 2010/04/16 20:20:11
注意:很少有路径和登录名使用 *
NOTE: Few paths and logins are masked using *
根据 Simon Large(TortoiseSVN 的合著者):
According to Simon Large (co-author of TortoiseSVN):
使用存储库浏览器并从上下文菜单中解除锁定".
Use the repo browser and 'break lock' from the context menu.
截图:
请注意,此项目仅在该项目实际上已锁定时才会出现.在 repo 浏览器之外还有一个释放锁定..."命令,如下所示:
Note that this item will only appear if the item is, in fact, locked. There's also a 'Release lock...' command outside of the repo browser, shown here: