SVN 文件被我锁定,现在无法提交
场景:二进制文件需要svn锁才能修改。要修改,文件首先被锁定、修改,然后在提交时使用“取消”按钮取消提交。由于某种原因,删除了包含锁定文件的整个文件夹(包括.svn文件夹)。
问题:我通过tortoise svn使用了“SVN更新”。所有文件均已更新。但之前被锁定的文件并不用锁定符号表示已锁定。尽管如此,我还是修改了该文件并尝试提交。
提交时出错:
Server sent unexpected return value (423 Locked) in response to PUT request for '/****/!svn/wrk/9f89b6b6-7932-9f45-82e8-fafbd5426290/trunk/***'
当我尝试使用“SVN Get Lock”再次获取锁定时,它失败显示:
尝试获取锁定时出错:
.`...is already locked by user 'kr***' in filesystem '/data/svn/dir/***/repos/***/db'`
我的感觉是,客户端的锁信息丢失,但服务器端仍然存在。
请建议一条出路。
版本信息:TortoiseSVN 1.6.8,Build 19260 - 32 Bit,2010/04/16 20:20:11
注意:少数路径和登录使用 * 进行屏蔽
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).
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.
Error while committing:
Server sent unexpected return value (423 Locked) in response to PUT request for '/****/!svn/wrk/9f89b6b6-7932-9f45-82e8-fafbd5426290/trunk/***'
While I try to acquire the lock again using "SVN Get Lock" it fails showing:
Error when trying to acquire the lock:
.`...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.
Please suggest a way out.
Version info: TortoiseSVN 1.6.8, Build 19260 - 32 Bit , 2010/04/16 20:20:11
NOTE: Few paths and logins are masked using *
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(4)
根据 Simon Large(TortoiseSVN 的合著者):
屏幕截图:
请注意,仅当该项目实际上被锁定时,此项目才会出现。在存储库浏览器之外还有一个“释放锁定...”命令,如下所示:
According to Simon Large (co-author of TortoiseSVN):
Screenshot:
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:
对工作副本根目录进行清理解决了我的问题。
我在执行SVN 提交时也执行了取消。
A Clean up on the working copy root fixed the issue for me.
I, too, had done a Cancel while doing a SVN Commit.
在终端中,
将打破锁。
In the terminal,
will break the locks.
有时,当我使用 SVN 时,您可以重新签出,然后合并对该文件的更改。合并后,您可以将文件提交到 SVN。
Sometimes back I was using the SVN, You can take a fresh checkout and then merge your changes on that file. Once you merge it you can commit the file to SVN.