SVN 拒绝提交。无需更新
我正在使用 Flash Builder for PHP 4.5 来处理 PHP 项目。它本质上是构建在 eclipse 之上的 Zend Studio。
我已经移动了一些文件夹和文件，并从 Flash Builder 中重命名了一些文件。一些文件也被删除。然后我尝试使用 SVN。
SVN 返回错误，指出提交失败，因为其中一个文件不是最新的。巧合的是，这也是被删除的文件之一。
然后我首先进行更新并收到消息：没有要合并的更改。
尝试再次提交只会导致错误，指出文件不是最新的。
关于如何解决这个问题有什么想法吗？
I am using Flash Builder for PHP 4.5 to work on a php project. It is essentially Zend Studio which is built on top of eclipse.
I've moved some folders and files, renamed some files from within Flash Builder. Some files were also removed. I then attempted to commit to SVN.
SVN comes back with an error saying commit failed as one of the files is not up to date. Conincidentally, this is also one of the files that was removed.
I then proceeded to do an update first and got the message: No changes to merge.
Trying to commit again just results in an error saying that the files are not up to date.
Any ideas as to how I can fix this?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
假设是已删除的文件导致提交失败，您可以尝试恢复已删除的文件，然后更新，然后再次删除，但如果失败，您可能需要考虑复制在 WC 中所做的更改，恢复原始文件，更新原始文件，然后将所有更改复制回来。
或者，如果您确定只有已删除的文件导致提交失败，请先提交其他所有内容，然后返回并恢复已删除的文件，更新，然后删除并再次提交。就像我说的，SVN 对于肮脏的工作副本是善变的......
Assuming that it's the deleted file that's making your commits fail, you can try reverting the deleted file, then updating, then deleting again, but if that fails, you might want to consider making a copy of the changes you made in your WC, revert the originals, update the originals, then copy all the changes back.
OR, if you're sure that it's only that deleted file that's making the commit fail, then commit everything else first, then go back and revert the deleted file, update, then delete and commit again. Like I said, SVN is fickle about dirty working copies...