当“svn cleanup"失败时我该怎么办? [英] What should I do when 'svn cleanup' fails?

问题描述

我在一个工作文件夹中有很多更改，并且尝试进行更新时出错了.

I have a lot of changes in a working folder, and something screwed up trying to do an update.

现在，当我发出svn cleanup"命令时，我得到:

Now when I issue an 'svn cleanup' I get:

>svn cleanup .
svn: In directory '.'
svn: Error processing command 'modify-wcprop' in '.'
svn: 'MemPoolTests.cpp' is not under version control

MemPoolTests.cpp 是另一个开发人员添加的新文件，并在更新中被删除.它以前不存在于我的工作文件夹中.

MemPoolTests.cpp is a new file another developer added and was brought down in the update. It did not exist in my working folder before.

我可以做些什么来尝试前进而无需签出存储库的新副本?

Is there anything I can do to try and move forward without having to checkout a fresh copy of the repository?

澄清:感谢您提供有关将目录移开并删除新副本的建议.我知道这是一种选择，但这是我想避免的一种选择，因为有许多更改嵌套在多个目录深处(这应该是一个分支......)

Clarification: Thanks for the suggestions about moving the directory out of the way and bringing down a new copy. I know that is an option, but it is one I'd like to avoid since there are many changes nested several directories deep (this should have been a branch...)

我希望有一种更积极的清理方式，也许以某种方式强制文件 SVN 无法恢复到已知状态(并且我尝试删除它的工作副本......但没有帮助).

I'm hoping for a more aggressive way of doing the cleanup, maybe someway of forcing the file SVN is having trouble with back into a known state (and I tried deleting the working copy of it ... that didn't help).

推荐答案

当重新开始不是一种选择时...

When starting all over is not an option...

我删除了 .svn 目录中的日志文件(我也删除了 .svn/props-base 中的违规文件)，进行了清理，并恢复了我的更新.

I deleted the log file in the .svn directory (I also deleted the offending file in .svn/props-base), did a cleanup, and resumed my update.

这篇关于当“svn cleanup"失败时我该怎么办?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！