如何从Subversion获取部分更新 [英] how to get partial update from subversion

问题描述

我处于应用程序存储库中的以下情形中:

I'm in the following scenario in my application's repository:

• 修订版7(2个更改的文件，1个添加的文件)
• 修订版6(更改了4个文件)
• 修订版5(添加了2个，删除了2个，更改了2个)
• 修订版4(3个更改的文件)
• 修订版3(添加了12个，更改了2个文件)

我想获得一个工作副本，其中包括从修订版3到Head的所有更改，但不包括修订版5和6的更改.

I want to get a working copy that includes all changes from revision 3 to Head but does NOT include the changes for revisions 5 and 6.

我正在为此使用SVN合并，但是更改未得到反映，并且版本5和6出现文件冲突.

I am using SVN merge for this, but changes are not being reflected, and I'm getting file conflicts for revision 5 and 6.

下面是nant的配置文件描述，其中包含为此的可执行命令.

Below is the config file description of nant that contains executable commands for this.

<exec program="C:\Program Files\CollabNet\Subversion Client\svn.exe" commandline="checkout https://test.repositoryhosting.com/svn/1_test@${Rev} D:\MyTest --username test --password 123"/> 
<exec program="C:\Program Files\CollabNet\Subversion Client\svn.exe" commandline="merge -c  -6  https://test.repositoryhosting.com/svn/1_test  D:\MyTest  --username test --password 123"  />
<exec program="C:\Program Files\CollabNet\Subversion Client\svn.exe" commandline="merge –c  -5  https://test.repositoryhosting.com/svn/1_test  D:\MyTest  --username test --password 123"  />
<exec program="D:\NANT_SCRIPTS\Delete Publish.bat"  commandline="${Rev}" />
<exec program="C:\Windows\Microsoft.NET\Framework\v2.0.50727\aspnet_compiler.exe" commandline="-nologo -v / -p D:\ MyTest -u D:\PublishOutput_${Rev}" />

我该如何解决这个问题?

How can I solve this issue?

推荐答案

您可以尝试以其他方式执行此操作:

You can try to do this the other way around:

• 还原版本6的更改
• 提交
• 还原版本5的更改
• 提交
• 签出总修订版

这会将工作副本带到您想要的状态.修订版5和6的更改将在存储库中还原，但是在您提交更改后，无论如何都会发生这种情况.

This should bring the working copy to the state you'd like. The changes of revision 5 and 6 will be reverted in the repository, but this will anyway happen when you commit your changes.

这篇关于如何从Subversion获取部分更新的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！