如何将不同分支下的文件夹的内容合并到svn中的新文件夹

Question

前一段时间我在 svn 下创建了一个新分支，现在需要将其合并到主干中。问题是我还需要将它移动到与之前不同的文件夹下，我不清楚如何从其他帖子中实现这一点。

这是目录结构

|--branches
|   |--V6_2_1_Branch
|      |--licensing
|         |--SLG
|            |--WebContent
|               |--License Generator
|                  { Contents I want to move }
|
|--trunk
   |--licensing
       |--LG2 (New Folder since the other branch was created)
          |-- licenseWebPortal (Where I want to put the contents)

我通常使用 tortoise cvs，但我们刚转移到 svn。（我知道我们落后于时代但它是遗留产品）

Answer 1

我能够使用 "Merging Two Different Trees" 方法做到这一点。只需确保在发件人字段中列出中继线。从文档中，"In the From: field enter the full folder URL of the trunk. This may sound wrong, but remember that the trunk is the start point to which you want to add the branch changes."

如何将不同分支下的文件夹的内容合并到svn中的新文件夹

How to merge the contents of a folder under a different branch to a new folder in svn

svn

tortoisesvn