SVN:如何合并来自单独项目的标签 [英] SVN: how to merge tags from separate projects

问题描述

我有一个带有两个独立项目的SVN存储库:

I have a single SVN repository with two separate projects:

project_1
    /trunk
    /branches
        /1.0
    /tags
        /1.0.0

project_2
    /trunk
    /branches
        /1.0
    /tags
        /1.0.0

如您所见，每个都有相同的分支/标签号.想象每个项目中都有不同的文件.

As you can see, each has identical branch/tag numbers. Imagine there are different files in each project.

我想将它们合并到一个新项目project_3中.也就是说，新项目的trunk将具有来自project_1和project_2的trunk的所有文件/历史记录，1.0分支将具有来自project_1的1.0分支的所有文件/历史记录. c3>和project_2，以及1.0.0标记将具有project_1和project_2的1.0.0标记中的所有文件/历史记录.

I want to merge these into a single new project, project_3. That is, the trunk of the new project will have all files/histories from the trunk of project_1 and project_2, the 1.0 branch will have all files/histories from the 1.0 branches of project_1 and project_2, and the 1.0.0 tag will have all files/histories from the 1.0.0 tags of project_1 and project_2.

我的第一个想法是使用多个svn cp执行来完成此任务.我遇到的一个大问题是

My first thought was to do accomplish this using multiple svn cp executions. A big problem I ran into was not being able to copy just the subdirectories of a directory to another directory. I am having trouble understanding whether the solutions discussed in that post apply to the situation here. Also, the post and many of the solutions are six years old and I wonder whether there have been any change to SVN that would help here.

目标是拥有一个统一的项目，并保留尽可能多的历史记录.在这里采取的最佳方法是什么?请注意，不能切换到另一个VCS.

The goal is to have a single unified project with as much history preserved as possible. What is the best approach to take here? Please note that switching to another VCS is not an option.

推荐答案

如果要合并数据和历史记录，则不能使用SVN复制"，必须使用dump | load周期:

If you want to merge data and history, you can't use SVN copy" you must to use dump|load cycles:

svnrdump sump URL/OF/DIR ... > dump + svnadmin load --ignore-uuid --parent-dir NEW_PARENT ... < dump

您可以尝试使用svnadmin dump | svndumpfilter

这篇关于SVN:如何合并来自单独项目的标签的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！