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:

然后我进入下一个窗口：
< img src = https://i.stack.imgur.com/siSr8.png alt =在此处输入图片描述>

Then I get next window:

还是我在做其他事情

推荐答案

只需将分支合并到任何目标

Just merge branch to any TARGET

编辑

确定，扩展答案：图片中的傻瓜合并

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

序言

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

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

用于此示例资源：

• 存储库 Hello，World http://mayorat.ursinecorner.ru:8088/svn/Hello/
  
  
  
  
  • 分行< a href = http://mayorat.ursinecorner.ru:8088/svn/Hello/branche s / branche-francaise rel = noreferrer> http://mayorat.ursinecorner.ru:8088/svn/Hello/branches/branche-francaise
  
  
  • 后备箱回购 http://mayorat.ursinecorner.ru:8088/svn/Hello/trunk
  
  
  • Repository "Hello, World" http://mayorat.ursinecorner.ru:8088/svn/Hello/
    • Branch http://mayorat.ursinecorner.ru:8088/svn/Hello/branches/branche-francaise
    • Trunk of repo http://mayorat.ursinecorner.ru:8088/svn/Hello/trunk
    
    
    • 本地目录 z：\WC-树干（树干的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
    

    需要WC

    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)

    定义（如果需要）一些其他合并选项，可以测试合并以便检测，将需要以任何形式解决冲突，或者只需开始真正的合并过程 t last

    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屋！