Change Set Based Merges in Subversion

Hopefully you have already read my post from last week, Subversion merge made easy.  In that post, I linked to information on the new CollabNet Merge client that we are building for Subversion 1.5.  There has been a lot of good feedback from users who have downloaded and tried that client.

This week, we are introducing a preview of an extension to the merge client that allows you to perform merges based on change sets.  With this extension to the merge client, users of CollabNet Enterprise Edition’s Project Tracker can perform merges by specifying Project Tracker artifacts as the input to the merge process instead of having to specify a list of revisions.  This is a really easy way to perform certain types of merges and can lead to some interesting new workflows and business processes.

If you have already installed the merge client, you can just visit the same installation site and grab the change set extension.  I have also written an overview of the client that has some more details and screenshots.  Click here for the overview of the change set extension.

While you will need Subversion 1.5 on your server to get the full benefits of merge tracking, the bulk of the features of this change set extension can be used today with your version of CollabNet Enterprise Edition.  So give it a try and let us know what you think.

Mark Phippard

Engineering manager for several teams at CollabNet, including CloudForge, Subversion, Subversion Edge, Git and our Desktops and Integrations. Project owner for the Subclipse project, which provides Subversion support in Eclipse. Also a full committer for the Subversion project. Product owner for GitEye, Subversion Edge and the CollabNet Desktops and Integrations.

Tagged with: , , , , , , , , , ,
Posted in Subversion
2 comments on “Change Set Based Merges in Subversion
  1. If you do not have CollabNet Enterprise Edition, a free 15 user download is at

  2. Change Set Based Merges in Subversion

    也许你已经度过了我上周的blog,Subversion merge made easy。在那篇文章里,我作了一些CollabNet Merge client的链接,得到了许多下载并试用客户端的反馈。 本周,我们引入了一个合并客户端扩展的预览,允许你执行基于变更集的合并,随着客户端合并的扩展,CollabNet企业版Project Tracker的用户可以指定项目跟踪作品作为合并过程的输入,而不是只能指定一组修订版本。这确实是执行特定类型合并的简单方法,将会导致一些有趣的新工作流程和商业流程。 如果你…

Leave a Reply

Your email address will not be published. Required fields are marked *