为什么TortoiseSVN删除总会导致冲突?

时间:2014-02-24 21:00:03

标签: svn tortoisesvn

我点击TortoiseSVN->删除。然后,当我提交时,我收到以下错误:

Deleting: C:\00.Source\Code\trunk\Folder\Database\FileToDelete.something  
Error: Commit failed (details follow):  
Error: The MERGE response contains invalid XML (200 OK)  

我再次承诺并获得:

Deleting: C:\00.Source\Code\trunk\Folder\Database\FileToDelete.something  
Error: Commit failed (details follow):  
Error: File  
Error:  'C:\00.Source\Code\trunk\Folder\Database\FileToDelete.something'  
Error:  is out of date  
Error: '/svn/Apps/!svn/wrk/fdsafasfdasdf/Code/trunk/Folder/Database/FileToDelete.something'  
Error:  path not found  
Error: Additional errors:  
Error: DELETE of  
Error:  '/svn/Apps/!svn/wrk/fdsafasfdasdf/Code/trunk/Folder/Database/FileToDelete.something':  
Error:  404 Not Found  
Error: You have to update your working copy first.  
Completed!:   

我更新并获取:

Updating: C:\00.Source\Code\trunk\Folder\Database  
Tree conflict: C:\00.Source\Code\trunk\Folder\Database\FileToDelete.something  
application/octet-stream
Completed: At revision: 51624  
Warning!: One or more files are in a conflicted state.  

然后我必须单击“解决”并且一切正常。我做错了吗?

由于之前的问题,我仍然在1.8.0上:TortoiseSVN Won't Allow Me To Add Any Files, 但我认为这不是问题。

0 个答案:

没有答案