颠覆:什么是“目标路径不存在"?合并时是什么意思? [英] Subversion: what does "Target path does not exist" when merging mean?

问题描述

使用Subversion 1.5，我有一个分支B，它是从分支A分支出来的.在两个分支中都做完工作之后，我去将A的更改合并到B中(使用B的工作目录中的svn merge http://path/to/A)并得到svn: Target path does not exist .这是什么意思?

Using subversion 1.5 I have branch B which was branched off of branch A. After doing work in both branches I go to merge changes from A into B (using svn merge http://path/to/A in the working directory of B) and get svn: Target path does not exist. What does this mean?

推荐答案

这意味着分支A中的文件发生了更改，Subversion尝试将其合并到分支B中，但是该文件在分支B中不存在，因此它无处可合并更改.例如:

It means that there was a change in a file in branch A which Subversion tried to merge into branch B, but the file does not exist in branch B, so it has nowhere to merge the change. For example:

• 创建分支B
• 更改A/README
• 删除B/README
• 合并A-> B

现在，自述文件中的更改无法在分支B中应用，因为该文件已被删除.

Now the change in README cannot be applied in branch B, because the file has been removed there.

这将在Subversion 1.6中导致树冲突.

This will result in a tree conflict in Subversion 1.6.

这篇关于颠覆:什么是“目标路径不存在"?合并时是什么意思?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！