我如何纠正“提交失败".文件xxx已过期.找不到xxx路径." [英] How do I correct "Commit Failed. File xxx is out of date. xxx path not found."
问题描述
我最近遇到了一个特别棘手的问题，那就是在Subversion中提交合并结果.我们的Subversion服务器是@ 1.5.0，而我的TortoiseSVN客户端现在是@ 1.6.1.
I have recently run into a particularly sticky issue regarding committing the result of a merge in subversion. Our Subversion server is @ 1.5.0 and my TortoiseSVN client is now @ 1.6.1.
我正在尝试将功能分支合并回我的主干.合并似乎可以正常进行；但是，提交失败并显示以下错误消息.
I am trying to merge a feature branch back into my trunk. The merge appears to work okay; however, the commit fails with the following error message.
Commit failed (details follow):
File
'flex/src/com/penbay/invision/portal/services/http/soap/ReportServices/GetAllBldgsParamsByRegionBySiteResultEvent.as'
is out of date
'/svn/ibis/!svn/wrk/531d459d-80fa-ea46-bfb4-940d79ee6d2e/visualization/trunk/source/flex/src/com/penbay/invision/portal/services/http/soap/ReportServices/GetAllBldgsParamsByRegionBySiteResultEvent.as'
path not found
You have to update your working copy first.
我的工作箱是最新的.我什至将一个新文件夹签出到另一个文件夹中，以确保合并后不会在本地产生混乱.我对此进行了更多研究，我认为部分问题是用户错误.我认为我们的问题是:
My working trunk is up to date. I have even checked out a new one into a different folder to make sure there wasn't any local cruft messing with the merge. I have done some more research into this and I think part of the problem is user error. I think our problems are:
- 我们有一些开发人员在1.5之前以及之后的某个时间与Subversion客户端进行合作.我相信这有可能破坏合并信息.
- 在其他分支中，我们执行了部分合并.也就是说，我们并不总是在分支的根目录执行合并.这是为了促进在同一分支中更新Flex和.NET的工作.
- 我们在分支机构执行了循环(自反)合并.之所以这样做，是因为我们有多个并行分支，并且我们希望使用主干中的最新代码定期更新分支.
Subversion本书/团队明确不建议所有这些内容.我们已经吸取了教训，现在知道了最佳实践.但是，我们首先需要合并并提交我们的最新分支.
All of these things are explicitly not recommended by the Subversion book/team. We have learned our lesson and now know the best practices. However, we first need to merge and commit our latest branch.
解决我们遇到的问题的最佳方法是什么?
What it the best way to correct the problems we are encountering?
是否可以删除主干和分支中的所有合并信息? 不.我已经做到了，但是它不能解决我遇到的错误.
Would deleting all the merge info in the trunk and branch be a viable solution? No. I have done this but it does not resolve the error that I am getting above.
推荐答案
我今天遇到了同样的问题，并且没有进行任何中间合并，因此从您的开幕文章来看，只有#1可能适用-但是我已经提交了既来自ubuntu中的svn客户端，也来自Windows中的tortoisesvn.幸运的是，在我的案例中，没有对主干进行任何更改，因此我可以用分支替换主干.那么可能是不同的svn版本吗?真令人担忧.
I've had the same issue today and I've not done any intermediate merges so from your opening post only #1 might apply - however i have made commits both from an svn client in ubuntu as well as tortoisesvn in windows. Luckily in my case no changes to the trunk were made so I could just replace the trunk with the branch. Possibly different svn versions then? That's quite worrying.
如果您使用svn移动/复制/删除功能，尽管在我的情况下没有丢失任何历史记录-我svn移动了主干，然后svn将分支移动到了主干.
If you use the svn move / copy /delete functions though no history is lost in my case - i svn moved the trunk and then svn moved the branch to trunk.
这篇关于我如何纠正“提交失败".文件xxx已过期.找不到xxx路径."的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！
