NOTE: I’ve noticed a lot of traffic to this page for “local edit incoming delete on update” errors, which are not what this article is about (the solution below may or may not work for that — I have no idea). This article is about “local delete , incoming delete on update” errors. Always back up your work before you muck around with something like this, but that goes doubly if you’re going to try to use these instructions for the “local edit” error.
For reason I’m still trying to untangle, I encountered some really terrible conflicts this afternoon with an SVN checkin that didn’t complete properly, leaving me with a few locked directories that wouldn’t respond to “svn cleanup”.
Using these instructions , I was able to get the directories sorted out:
- Move offending directories out of working copy and to a safe place (e.g. desktop)
- Run
svn cleanup - Run
svn up
This actually restored the messed-up directories. Some files were reverted and some deleted files restored; once the entire working copy is cleaned up, you can use the backup copies of the directories to copy back in your changes.
But before I could do that, I was left with a half-dozen individual file conflicts with the following messages:
遇到问题:
root@ubuntu:/home/my_project/usrp/airprobe/my_gsm_receiver1/my_gsm-receiver# svn commit
svn: 提交失败(细节如下):
svn: 包含工作副本管理数据的目录“/home/my_project/usrp/airprobe/my_gsm_receiver1/my_gsm-receiver/autom4te.cache/.svn”丢失了
解决办法:
root@ubuntu:/home/my_project/usrp/airprobe/my_gsm_receiver1/my_gsm-receiver# rm -r autom4te.cache/
root@ubuntu:/home/my_project/usrp/airprobe/my_gsm_receiver1/my_gsm-receiver# svn cleanup
root@ubuntu:/home/my_project/usrp/airprobe/my_gsm_receiver1/my_gsm-receiver# svn up
A autom4te.cache
A autom4te.cache/output.1
A autom4te.cache/traces.0
A autom4te.cache/traces.1
A autom4te.cache/requests
A autom4te.cache/output.0
更新到版本 9。