svn - Subversion: Can I tell the conflict resolver, to look for structural changes not on the incomig, but on the local files?

Question

Note: The underlying situation of this question is also part of a slightly different question here.

Situation

I have a trunk, where earlier, a branch has been made from. Then, in the trunk some file renamings have been made. These renamings were accidentially made by "copy/delete", not with the proper svn rename process as they should have. This is described in the TSVN docs, and in my case the "Repair move" was omitted.

Now I have tree conflicts, when merging the branch back to the trunk:

• the merging tool does not recognise these renamings, and reports them as tree conflict
• While the "New interactive conflict resolver" should find such faulty renames, it seems to do so only on incoming changes, not for those in the target (trunk in my case).

Question

• Can I tell the conflict resolver to look for structural changes in the target (local files), not the incoming tree?

Answer 1

我可以告诉冲突解决程序在目标（本地文件）而不是传入树中查找结构更改吗？

是的你可以。更准确地说 - 新的解析器“自动”执行它：请参阅“本地更改 - 删除，传入 - 编辑”一章引用的表的最后一个字符串

您常见的（此处和链接的问题）问题 - 缺少重命名信息，您必须解决（需要一些手工操作）：您必须导出坏删除变更集的转储，修复它，然后导入回来。我很久以前就做过这些技巧，因此 - 现在我只有“如何”的想法