如果文件夹结构发生变化，如何将分支集成到主干中? [英] how do I integrate a branch into a trunk if the folder structure has changed?

问题描述

我需要将一个分支集成到主干中，但同时我的主干的文件夹层次结构发生了变化.我应该仍然能够合并保留原始结构的子文件夹，但是当我尝试时出现错误.

I need to intergrate a branch into the trunk but the folder hierarchy of my trunk changed in the meantime. I should still be able to merge sub-folders which preserve the original structure, but when I try I get an error.

示例:

• 创建分支时的原始结构:
  • svn/trunk/dir1/dir2 --> svn/branches/b1/dir1/dir2
  • svn/trunk/dir1 --> svn/trunk/dir3

  现在我想重新整合 svn/branches/b1/dir1/dir2 --> svn/trunk/dir3/dir2

  Now I want to reintegrate svn/branches/b1/dir1/dir2 --> svn/trunk/dir3/dir2

  推荐答案

  Subversion 的 merge 应该可以在任何目录下工作，所以就这样做

  Subversion's merge should work in any directory so just do

  svn merge svn/branches/b1/dir1/dir2 svn/trunk/dir3/dir2 svn/trunk/dir3/dir2

  这篇关于如果文件夹结构发生变化，如何将分支集成到主干中?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！