合并分支后提交主干时出错。如何解决？

发布于 2024-09-15 05:37:32 字数 568 浏览 14 评论 0原文

我收到以下颠覆错误：

Subversion does not allow to commit this combination of files and directories at once. 
Directory deletes must be recursive and this would commit other files:

Deleted directory: 
    D:\mm32.net\Trunk\MyApp.Web\App_Themes\Factsheet_print\Images\Risk

Directory to commit: 
    D:\mm32.net\Trunk 
Not to commit: 
    D:\mm32.net\Trunk\MyApp.Web\App_Themes\Factsheet_offline\Images\Risk\Very-High-Risk.jpg

我有一个分支，我删除了很多多余的东西。然后我将主干合并到该分支中。一切都很好，所以我承诺了。然后我将该分支合并到主干中。当我现在尝试提交 Trunk 时，它给了我错误。

有人可以指出如何解决这个问题吗？谢谢

原文

I'm getting the following subversion error:

Subversion does not allow to commit this combination of files and directories at once. 
Directory deletes must be recursive and this would commit other files:

Deleted directory: 
    D:\mm32.net\Trunk\MyApp.Web\App_Themes\Factsheet_print\Images\Risk

Directory to commit: 
    D:\mm32.net\Trunk 
Not to commit: 
    D:\mm32.net\Trunk\MyApp.Web\App_Themes\Factsheet_offline\Images\Risk\Very-High-Risk.jpg

I had a branch where I deleted loads of stuff that was redundant. I then merged trunk into that branch. Everything was fine, so I committed. Then I merged that Branch into Trunk. When I’m trying to commit Trunk now it’s giving me the error.

Can somebody point out how to resolve this? Thanks

分享到QQ

分享到微博