SVN无限循环失败（提交文件）
我正在尝试将对某些 python 工作的更改更新到 SVN 服务器上。当我尝试将文件提交到 svn 时，出现错误，指出我的文件夹已过期：
“正在传输文件数据 ........................ svn：提交失败（详细信息如下）： svn: 目录 '/scripts/setup/configure' 已过时”
当我尝试运行“svn update configure/”时，由于树冲突而失败：
“冲突摘要： 树冲突：1”
然后我尝试使用“svn解析--接受工作-R”来解决，它返回输出：
“已解决'配置'的冲突状态”
（注意，连续第二次运行解析命令没有返回任何输出，因为它已经“解决”）。
然后我尝试更新，并得到与之前相同的树冲突错误，我现在再次尝试解决将给出相同的输出，声称该问题。已解决，但试图更新“未解决”问题。
我已经为此工作了很长一段时间，但毫无进展，
谢谢。
I am trying to update my changes to some python work onto an SVN server. When I attempt to commit the file to the svn, I get an error that my folder is out of date:
"Transmitting file data .............svn: Commit failed (details follow):
svn: Directory '/scripts/setup/configure' is out of date"
When I attempt to run "svn update configure/", it fails due to a Tree conflict:
"Summary of conflicts:
Tree conflicts: 1"
I then attempt to resolve using "svn resolve --accept working -R .", which returns the output:
"Resolved conflicted state of 'configure'"
(Note, running the resolve command a second time in a row returns no output, as it is already 'resolved').
I then attempt to update, and get the same Tree conflict error as before. I am now back at step one. Attempting to resolve again will give the same output claiming that the issue has been resolved, but attempted to update 'un-resolves' the issue.
Any help/insight on this? I've been working at it for quite some time and have gotten nowhere.
Thank you
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
尽管它可能很笨拙，但在我真的无法弄清楚为什么 Subversion 会吐出它的假值的情况下，我只是进行一次新的检查，然后手动移动我的更改。
Kludgy though it may be, in the situations when I really can't work out why Subversion is spitting its dummy I just do a fresh checkout and then move my changes over by hand.
Pike65 的解决方案将会起作用。您还可以进行较小规模的操作，只需删除冲突的文件，进行更新，然后重新应用更改。
Pike65's solution will work. You can also do it on a smaller scale and just delete the conflicted files, do an update, and then re-apply your changes.