简体繁体 English

如何使用Netbeans将SVN分支重新集成到主干中？

[英]How to reintegrate a SVN branch into trunk with Netbeans?

原文 2012-01-27 13:22:53 4 2 svn/ merge/ netbeans-7.1/ svn-reintegrate/ svn-merge-reintegrate

I created a branch from trunk. 我从trunk创建了一个分支。 As development on my branch is finished, I want to merge (reintegrate) my branch into trunk. 当我的分支上的开发完成后，我想将我的分支合并（重新集成）到trunk。 Is there an option or setting to enable? 是否有选项或设置启用？ It seems Netbeans 7.1 isn't able to reintegrate a branch into trunk. 似乎Netbeans 7.1无法将分支重新集成到主干中。

Am I wrong? 我错了吗？

2 个解决方案

For Netbeans 8.2 you can use "Merge Changes..." to do that (not sure if this is also in netbeans 7.x available): 对于Netbeans 8.2，您可以使用“合并更改...”来执行此操作（不确定这是否也适用于netbeans 7.x）：

Right click your project/folder/file you want to merge 右键单击要合并的项目/文件夹/文件
Choose "Subversion" - "Copy" - "Merge Changes..." 选择“Subversion” - “复制” - “合并更改...”
Following the merging assistent 继合并之后

More information are here: https://netbeans.org/kb/docs/ide/subversion.html#merging 更多信息请访问： https ： //netbeans.org/kb/docs/ide/subversion.html#merging

just use another SVN user interface, for example TortoiseSVN or the svn command line tool, as those can do merges and will work on the same data as Netbeans SVN. 只需使用另一个SVN用户界面，例如TortoiseSVN或svn命令行工具，因为它们可以进行合并，并且可以使用与Netbeans SVN相同的数据。

If you have some time to spare, you could read the section "SVN merges are broken" of http://ventspace.wordpress.com/2011/03/09/understanding-subversions-problems/ and learn about distributed version control systems like git or mercurial that were created (amongst other reasons) to provide working merging in version control. 如果您有空闲时间，可以阅读http://ventspace.wordpress.com/2011/03/09/understanding-subversions-problems/上的 “SVN合并已损坏”部分，并了解分布式版本控制系统，如创建的git或mercurial（以及其他原因）在版本控制中提供工作合并。