SVN如何解决“本地添加、传入添加更新”*文件夹*?

Here is my scenario:

这是我的场景:

Assume we have an SVN repo with the following content: myfolder myfolder\file.txtAssume we have