Tortoisesvn Subversion 1.8 - 合并 - 不再重新集成分支选项 [英] Tortoisesvn Subversion 1.8 - merge - no more reintegrate a branch option

问题描述

在 tortoiseSvn 1.8 中没有重新整合"分支选项.在 Tortoise Svn 1.8 中重新集成分支的正确方法是什么?

In tortoiseSvn 1.8 there is no "reintegrate" a branch option. What is the right way to reintegrate a branch in Tortoise Svn 1.8?

在选择合并然​​后下一个选项:

In choose merge and then next option:

然后我得到下一个窗口:

Then I get next window:

还是我做错了什么?

推荐答案

只需将分支合并到任何 TARGET

Just merge branch to any TARGET

编辑

好的，扩展答案:图片中的合并傻瓜"

OK, extended answer: "Merge for Dummies" in pictures

前言

好的，我不会掩饰或隐藏使用过的试验场.

OK, I will not mask or hide used proving ground.

在本示例资源中使用:

• 存储库你好，世界"http://mayorat.ursinecorner.ru:8088/svn/你好/
  • 分支机构 http://mayorat.ursinecorner.ru:8088/svn/Hello/branches/branche-francaise
  • repo 主干 http://mayorat.ursinecorner.ru:8088/svn/Hello/trunk
  • 本地目录z:WC-Trunk(trunk的WC，进程中使用)
  • TortoiseSVN 1.8.1，内部版本 24570 - 32 位
  • Local directory z:WC-Trunk (WC of trunk, used in process)
  • TortoiseSVN 1.8.1, Build 24570 - 32 Bit

  重现步骤

  为了将分支合并到主干，我必须拥有主干的工作副本，因此 - 将主干的 HEAD 签出到 WC-Trunk

  In order to merge branch to trunk, I have to have Working Copy of trunk, thus - trunk's HEAD checkouted to WC-Trunk

  z:WC-Trunk>svn ls
  Dr?p?r.ma?ar.sv?nskan.man.eller.smalensk?n.txt
  Hello.de.txt
  Hello.en.txt
  Hello.eo.txt
  Hello.fr.txt
  

  需要厕所

  z:WC-Trunk>svn info
  Path: .
  Working Copy Root Path: Z:WC-Trunk
  URL: http://mayorat.ursinecorner.ru:8088/svn/Hello/trunk
  Relative URL: ^/trunk
  ...
  

  开始合并

  选择合并范围"，因为此方法涵盖了对分支(或主干)进行了一次或多次修订并且希望将这些更改移植到不同分支的情况"

  Select "Merge range", because "This method covers the case when you have made one or more revisions to a branch (or to the trunk) and you want to port those changes across to a different branch"

  选择所有修订，如果没有定义和存储库中树的路径，必须合并到主干(我们的法语分支)

  Select all revisions, if otherwise not defined and path to tree in repository, which have to be merged to trunk (our French branch)

  定义(如果需要)一些额外的合并选项，可以测试合并以检测，将需要以任何形式解决冲突，或者只是开始真正的合并过程

  Define (if needed) some additional merge options, can test merge in order to detect, will be conflict resolution needed in any form, or just start real merge process at last

  这篇关于Tortoisesvn Subversion 1.8 - 合并 - 不再重新集成分支选项的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！