file - svn合并: source under renamed folder not merged

Question

trunk ---------------------------renamed dir a/b to a/g ---------------------
           \                                                                /
            \                                                              /
           branches/1.0----------------------modified file a/b/Hello.java --

将分支合并到主干。

 svn  merge ^/myproject/branches/1.0

获取冲突

   Tree conflict on 'a\b'
   > local missing or deleted or moved away, incoming dir edit upon merge
    Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help: r

如果我选择“标记已解决”，则忽略(不合并)a/b 下的修改文件Hello.java。我应该怎么做才能将更改的文件拉到冲突树下(例如 Hello.java)？如何合并到这个senario中？

svn，版本 1.9.1 (r1698128)

Answer 1

在这种情况下，您必须直接在文件夹级别合并

cd trunk_working_copy
svn  merge ^/myproject/branches/1.0/a/b ./a/g