合并Branch后重新提交Trunk时出错。如何解决？

Question

我收到以下颠覆错误：

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合并到该分支中。一切都很好，所以我承诺。然后我将该分支合并为Trunk。当我现在尝试提交Trunk时，它给了我错误。

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

Answer 1

我用Tortoise SVN做了它并且它起作用了......