blocks|key|3355182|text|你应该使用“合并修订范围”。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3355183|要将更改从主干合并到分支，请在分支工作副本中选择“合并修订范围”，然后输入主干URL以及要合并的起始和结束修订。|3355184|以相反的方式合并主干中的分支。|3355185|关于--reintegrate标志，在这里检查手册：http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html#tsvn-dug-merge-reintegrate|offset|length|3355186|entityMap|0|LINK|mutability|MUTABLE|url|http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html#tsvn-dug-merge-reintegrate^0|0|0|0|Q|2P|0|0^^$0|@$1|2|3|4|5|6|7|R|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|S|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|T|8|@]|9|@]|A|$]]|$1|F|3|G|5|6|7|U|8|@]|9|@$H|V|I|W|1|X]]|A|$]]|$1|J|3|-4|5|6|7|Y|8|@]|9|@]|A|$]]]|K|$L|$5|M|N|O|A|$P|Q]]]]

You should use "merge a range of revision".

To merge changes from the trunk to a branch, inside the branch working copy choose "merge range of revisions" and enter the trunk URL and the start and end revisions to merge.

The same in the opposite way to merge a branch in the trunk.

About the --reintegrate flag, check the manual here: <a href="http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html#tsvn-dug-merge-reintegrate" rel="noreferrer">http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html#tsvn-dug-merge-reintegrate</a>

blocks|key|355262|text|行为取决于您的存储库的版本。Subversion+1.5允许4种类型的合并：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|355263|合并源URL1@N+sourceURL2@M|355264|merge源WCPATH1@N源WCPATH2@M+WCPATH|unordered-list-item|355265|
|355266|merge+[-c+M，N...%7C+-r+N:m...]SOURCE@REV|355267|355268|merge+--重新集成源@REV|355269|355270|版本1.5之前的Subversion只支持前两种格式。|355271|从技术上讲，您可以使用前两种方法执行所有合并，但后两种方法支持Subversion1.5的合并跟踪。|355272|当您的存储库是1.5%2B时，TortoiseSVN的选项将范围或修订映射合并到方法3，或者当您的存储库更旧时，将其合并到方法1。|355273|在将特性合并到发布/维护分支时，您应该使用“合并修订范围”命令。|355274|只有当你想要将一个分支的所有特征合并回一个父分支(通常是主干)时，你才应该考虑使用“重新整合分支”。|355275|最后一个命令-Merge两个不同的树-只有当你想要跳出正常的分支行为时才有用。(例如，比较不同的版本，然后将差异合并到另一个分支)|355276|entityMap^0|0|0|0|0|0|0|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|12|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|13|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|14|8|@]|9|@]|A|$]]|$1|G|3|H|5|6|7|15|8|@]|9|@]|A|$]]|$1|I|3|J|5|F|7|16|8|@]|9|@]|A|$]]|$1|K|3|H|5|6|7|17|8|@]|9|@]|A|$]]|$1|L|3|M|5|F|7|18|8|@]|9|@]|A|$]]|$1|N|3|-4|5|6|7|19|8|@]|9|@]|A|$]]|$1|O|3|P|5|6|7|1A|8|@]|9|@]|A|$]]|$1|Q|3|R|5|6|7|1B|8|@]|9|@]|A|$]]|$1|S|3|T|5|6|7|1C|8|@]|9|@]|A|$]]|$1|U|3|V|5|6|7|1D|8|@]|9|@]|A|$]]|$1|W|3|X|5|6|7|1E|8|@]|9|@]|A|$]]|$1|Y|3|Z|5|6|7|1F|8|@]|9|@]|A|$]]|$1|10|3|-4|5|6|7|1G|8|@]|9|@]|A|$]]]|11|$]]

The behavior depends on which version your repository has. Subversion 1.5 allows 4 types of merge:

<ol>
<li>merge sourceURL1[@N] sourceURL2[@M] [WCPATH]</li>
<li>merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]</li>
<li>merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [WCPATH]</li>
<li>merge --reintegrate SOURCE[@REV] [WCPATH]</li>
</ol>

Subversion before 1.5 only allowed the first 2 formats.

Technically you can perform all merges with the first two methods, but the last two enable subversion 1.5's merge tracking.

TortoiseSVN's options merge a range or revisions maps to method 3 when your repository is 1.5+ or to method one when your repository is older.

When merging features over to a release/maintenance branch you should use the 'Merge a range of revisions' command. 

Only when you want to merge all features of a branch back to a parent branch (commonly trunk) you should look into using 'Reintegrate a branch'.

And the last command -Merge two different trees- is only usefull when you want to step outside the normal branching behavior. (E.g. Comparing different releases and then merging the differenct to yet another branch)

blocks|key|3355306|text|看看svnmerge.py吧。它是命令行，不能被TortoiseSVN调用，但它更强大。从FAQ|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|3355307|3355308|传统subversion将允许您合并更改，但它不会“记住”您已经合并的内容。它也没有提供一种方便的方法来将变更集排除在合并之外。svnmerge.py自动化了一些工作，并对其进行了简化。Svnmerge还会创建一条提交消息，其中包含它合并的所有内容的日志消息。|blockquote|3355309|3355310|entityMap|0|LINK|mutability|MUTABLE|url|http://www.orcaware.com/svn/wiki/Svnmerge.py|1|http://www.orcaware.com/svn/wiki/Svnmerge.py#FAQ^0|2|B|0|19|3|1|0|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@$A|T|B|U|1|V]|$A|W|B|X|1|Y]]|C|$]]|$1|D|3|-4|5|6|7|Z|8|@]|9|@]|C|$]]|$1|E|3|F|5|G|7|10|8|@]|9|@]|C|$]]|$1|H|3|-4|5|6|7|11|8|@]|9|@]|C|$]]|$1|I|3|-4|5|6|7|12|8|@]|9|@]|C|$]]]|J|$K|$5|L|M|N|C|$O|P]]|Q|$5|L|M|N|C|$O|R]]]]

Take a look at <a href="http://www.orcaware.com/svn/wiki/Svnmerge.py" rel="nofollow noreferrer">svnmerge.py</a>. It's command-line, can't be invoked by TortoiseSVN, but it's more powerful. From the <a href="http://www.orcaware.com/svn/wiki/Svnmerge.py#FAQ" rel="nofollow noreferrer">FAQ</a>:

<blockquote>
 Traditional subversion will let you
 merge changes, but it doesn't
 "remember" what you've already merged.
 It also doesn't provide a convenient
 way to exclude a change set from being
 merged. svnmerge.py automates some of
 the work, and simplifies it. Svnmerge
 also creates a commit message with the
 log messages from all of the things it
 merged.
</blockquote>

blocks|key|3142558|text|我不能很好地理解其他的答案，这是一个更多的笨蛋指南…|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3142559|你可以通过go+trunk+->+branch或branch+->+trunk来实现。我总是先做trunk+->+branch，修复那里的任何冲突，然后再合并branch+->+trunk。|offset|length|style|CODE|3142560|将主干合并到分支/标记中|3142561|合并分支根上的分支/+tag|3142562|Right-click+%7C+Tortoise+%7C+|unordered-list-item|3142563|Checkout+...|ordered-list-item|BOLD|3142564|Merge类型：合并修订范围%7C单击'Next‘|3142565|3142566|3142567|📷|atomic|3142568|​|3142569|3142570|Merge修订范围：选择您复制到分支/标记的主干目录的URL。输入要合并的修订版本，或将该字段留空以合并所有修订版本%7C单击'Next‘|3142571|3142572|3142573|3142574|合并选项:我只是将它们保留为默认设置%7C单击‘|3142575|Merge’|3142576|3142577|3142578|3142579|3142580|这会将修订合并到已签出的分支/标记|3142581|中，然后将合并的更改提交到分支/标记|3142582|中|3142583|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://ask.qcloudimg.com/http-save/yehe-900000/681a439e1aefde2ccf1d66ca28d5b9a3.png|imageAlt|1|https://ask.qcloudimg.com/http-save/yehe-900000/6978a28e31a5e6e73227efa5d0de281b.png|2|https://ask.qcloudimg.com/http-save/yehe-900000/beb61b1121c89c28a9e8bb34bae188eb.png^0|0|8|F|O|F|1C|F|27|F|0|0|0|0|0|C|0|0|N|0|0|0|0|1|0|1|0|0|0|1|0|0|0|1V|0|0|0|1|0|1|1|0|0|1|0|0|M|0|0|6|0|0|0|1|0|1|2|0|0|1|0|0|0|H|0|0|I|0|0|1|0^^$0|@$1|2|3|4|5|6|7|1Y|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|1Z|8|@$D|20|E|21|F|G]|$D|22|E|23|F|G]|$D|24|E|25|F|G]|$D|26|E|27|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|28|8|@]|9|@]|A|$]]|$1|J|3|K|5|6|7|29|8|@]|9|@]|A|$]]|$1|L|3|M|5|N|7|2A|8|@]|9|@]|A|$]]|$1|O|3|P|5|Q|7|2B|8|@$D|2C|E|2D|F|R]]|9|@]|A|$]]|$1|S|3|T|5|Q|7|2E|8|@$D|2F|E|2G|F|R]]|9|@]|A|$]]|$1|U|3|-4|5|6|7|2H|8|@]|9|@]|A|$]]|$1|V|3|-4|5|6|7|2I|8|@]|9|@]|A|$]]|$1|W|3|X|5|Y|7|2J|8|@$D|2K|E|2L|F|R]]|9|@$D|2M|E|2N|1|2O]]|A|$]]|$1|Z|3|10|5|6|7|2P|8|@$D|2Q|E|2R|F|R]]|9|@]|A|$]]|$1|11|3|-4|5|6|7|2S|8|@]|9|@]|A|$]]|$1|12|3|13|5|Q|7|2T|8|@$D|2U|E|2V|F|R]]|9|@]|A|$]]|$1|14|3|-4|5|6|7|2W|8|@]|9|@]|A|$]]|$1|15|3|X|5|Y|7|2X|8|@$D|2Y|E|2Z|F|R]]|9|@$D|30|E|31|1|32]]|A|$]]|$1|16|3|10|5|6|7|33|8|@$D|34|E|35|F|R]]|9|@]|A|$]]|$1|17|3|18|5|6|7|36|8|@$D|37|E|38|F|R]]|9|@]|A|$]]|$1|19|3|1A|5|Q|7|39|8|@$D|3A|E|3B|F|R]]|9|@]|A|$]]|$1|1B|3|-4|5|6|7|3C|8|@]|9|@]|A|$]]|$1|1C|3|X|5|Y|7|3D|8|@$D|3E|E|3F|F|R]]|9|@$D|3G|E|3H|1|3I]]|A|$]]|$1|1D|3|10|5|6|7|3J|8|@$D|3K|E|3L|F|R]]|9|@]|A|$]]|$1|1E|3|-4|5|6|7|3M|8|@]|9|@]|A|$]]|$1|1F|3|1G|5|Q|7|3N|8|@$D|3O|E|3P|F|R]]|9|@]|A|$]]|$1|1H|3|1I|5|Q|7|3Q|8|@$D|3R|E|3S|F|R]]|9|@]|A|$]]|$1|1J|3|1K|5|6|7|3T|8|@$D|3U|E|3V|F|R]]|9|@]|A|$]]|$1|1L|3|-4|5|6|7|3W|8|@]|9|@]|A|$]]]|1M|$1N|$5|1O|1P|1Q|A|$1R|1S|1T|-4]]|1U|$5|1O|1P|1Q|A|$1R|1V|1T|-4]]|1W|$5|1O|1P|1Q|A|$1R|1X|1T|-4]]]]

I couldn't properly follow the other answers, here's more of a dummies guide... 

You can do this either way round to go <code>trunk -&gt; branch</code> or <code>branch -&gt; trunk</code>. I always first do <code>trunk -&gt; branch</code> fix any conflicts there and then merge <code>branch -&gt; trunk</code>.

<h3>Merge trunk into a branch / tag</h3>

<ol>
<li>Checkout the branch / tag</li>
<li>Right-click on the root of the branch | Tortoise SVN | Merge ...</li>
<li>Merge Type: Merge a range of revisions | Click 'Next'
<img src="https://i.stack.imgur.com/JfV4b.png" alt="enter image description here"></li>
<li>Merge revision range: Select the URL of the trunk directory that you copied to the branch / tag. Enter the revisions to merge or leave the field empty to merge all revisions | click 'Next'
<img src="https://i.stack.imgur.com/Y0X12.png" alt="enter image description here"></li>
<li>Merge options: I just left these as default | click 'Merge'
<img src="https://i.stack.imgur.com/foKHp.png" alt="enter image description here"></li>
<li>This will merge the revisions into the checked out branch / tag</li>
<li>Then commit the merged changes to the branch / tag</li>
</ol>

blocks|key|3142599|text|按住Shift键并右键单击该文件夹，然后选择TortoiseSVN+->+Merge+All|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3142600|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

Shift-Right Click on the folder and select TortoiseSVN -> Merge All

I've been reading up on branching/merging with Subversion 1.5 using the excellent and free <a href="http://svnbook.red-bean.com/" rel="noreferrer">Version Control with Subversion</a> book. I think that I understand how to use the Subversion command line client to perform the actions that I need most often, which are:

Update Branch with Changes from Trunk

From the branch's working directory run: 

<blockquote>
 svn merge <a href="http://svn.myurl.com/proj/trunk" rel="noreferrer">http://svn.myurl.com/proj/trunk</a>
</blockquote>

Merge Branch into Trunk

From the trunk's working directory run:

<blockquote>
 svn merge --reintegrate <a href="http://svn.myurl.com/proj/branches/mybranch" rel="noreferrer">http://svn.myurl.com/proj/branches/mybranch</a>
</blockquote>

However, we are using TortoiseSVN 1.5 as our interface to Subversion. I would like to know how best to perform these operations with TortoiseSVN. The new dialog provides three different options on the main menu. 

<ol>
<li>Merge a range of revisions</li>
<li>Reintegrate a branch</li>
<li>Merge two different trees</li>
</ol>

From what I can gather, TortoiseSVN always executes svn with the following syntax.

<blockquote>
 svn merge [--dry-run] --force From_URL@revN To_URL@revM PATH
</blockquote>

Additionally, reintegrate a branch often fails with a message stating that some targets have not been merged and so it cannot continue, and so I had to use option #3.

My questions are:

<ol>
<li>How do I use TortoiseSVN 1.5 to merge changes from the trunk to a branch?</li>
<li>How do I use TortoiseSVN 1.5 to merge the branch to the trunk, with and without the reintegrate method?</li>
<li>Which of the above options should I use for each, and why?</li>
</ol>

<hr>

EDIT

Through "dry run" testing I have found that the command line Subversion operation

<blockquote>
 svn merge <a href="http://svn.myurl.com/proj/trunk" rel="noreferrer">http://svn.myurl.com/proj/trunk</a>
</blockquote>

is analogous to option #1 (Merge a Range of Revisions) in TortoiseSVN, as long as I leave the revision range blank.

Using TortoiseSVN how do I merge changes from the trunk to a branch and vice versa?

服务器

我一直在阅读有关使用优秀且免费的使用Subversion1.5进行分支/合并的书籍。我想我知道如何使用Subversion命令行客户端来执行我最经常需要的操作，这些操作包括：使用干线中的更改更新分支从分支的工作目录运行：服务器合并将分支合并到干线中在主干的工作目录中运行：服务器合并--重新集成但是，我们使用Tortoi...

问如何使用TortoiseSVN将更改从主干合并到分支，反之亦然？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何使用TortoiseSVN将更改从主干合并到分支，反之亦然？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何使用TortoiseSVN将更改从主干合并到分支，反之亦然？
EN