2013-03-16 118 views
25

我只是试图添加&使用TortoiseSVN向VisualSVN提交大约25,000个文件。提交失败:已锁定

提交对话框锁定(预计我猜),但一段时间后线程被阻止,我杀死了Tortoise,希望一次提交更小的文件块。

现在我得到这个错误:

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

我杀了TortoiseProc.exe并重新启动的VisualSVN几次,但我仍然得到错误。

我还可以右键点击该文件夹并选择释放锁,但我得到:

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

当我运行svn st,我得到的所有等待要添加的文件的一个巨大的长期输出。

即使我尝试提交一些不相关的东西(几个dirs),我也会得到同样的错误。

我能够成功提交到同一台服务器上的单独回购。

如何释放锁定并提交这些文件?

+0

你已经尝试过清理命令? – duDE 2013-03-16 10:02:24

+0

如果'清理'不起作用,你需要有一个'新鲜的结帐' – Dotnet 2013-03-16 10:04:54

回答

67

试着做一个SVN清理。我有同样的问题,并在这之后,锁清理。

具体从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.

这里是推荐的SVN清理选项截图:

SVN Cleanup Screenshot

+0

默认选项是否正常? http://i.imgur.com/a0hZLMk.png – 2013-03-16 10:09:14

+0

@DannyBeckett这些是我为我选择的那些。这是最简单的方法,看看是否有效。应该是你需要的一切。 – jordanhill123 2013-03-16 10:11:43

+0

这会影响等待提交的任何其他文件吗?即在WC中比SVN服务器更新的无关文件(具有红色x而不是绿色复选标记的文件)。 – 2013-03-16 10:13:33

19

只是一个小除了乔丹的回答,我有同样的问题,但清理在犯罪文件夹失败,由于锁定。为了解决这个问题,我必须在父目录上执行SVN清理,然后在违规目录中进行清理。

3

如果你使用SVN在Eclipse上尝试清理,但它会失败我想是安装龟然后用破锁清理检查

enter image description here