我从我的主干创建了一个名为"feature3"的分支.我对"feature3"分支上的文件进行零修改.在trunk上也没有对文件进行修改.使用TortoiseCVS(TortoiseSVN 1.6.6,Build 17493 - 32 Bit)对抗SVN(版本1.6.3(r38063))repo,我启动了一个"Merge",选择了"Reintegrate a branch"选项.
此命令的输出显示合并的80个文件.这些文件唯一改变的是svn:mergeinfo属性.但为什么只有这80个文件呢？我在项目中有数百个其他文件未更改此属性.
以下是在单个文件上更改svn:mergeinfo属性的示例
之前:
/trax/branches/current/Libraries/Security/Specifications/NotSpecification.cs:10292-10783 /trax/branches/feature1/Libraries/Security/Specifications/NotSpecification.cs:11324/trax/branches/feature2/Libraries/Security/Specifications /NotSpecification.cs:11326/trax/branches/int/Libraries/Security/Specifications/NotSpecification.cs:11232-11314 /trax/branches/next/Libraries/Security/Specifications/NotSpecification.cs:10156-10782/trax/branches /trax-1.0.x/Libraries/Security/Specifications/NotSpecification.cs:10191-10291 /trax/branches/upgrade/Libraries/Security/Specifications/NotSpecification.cs:9964-10604 /trax/tags/trax-1.0.0 /Libraries/Security/Specifications/NotSpecification.cs:10178-10190 /trax/trunk/Libraries/Security/Specifications/NotSpecification.cs:6672-9851,11232-11325
后
/trax/branches/current/Libraries/Security/Specifications/NotSpecification.cs:10292-10783 /trax/branches/feature1/Libraries/Security/Specifications/NotSpecification.cs:11324/trax/branches/feature2/Libraries/Security/Specifications /NotSpecification.cs:11326/trax/branches/feature3/Libraries/Security/Specifications/NotSpecification.cs:11328-11334 /trax/branches/int/Libraries/Security/Specifications/NotSpecification.cs:11232-11314/trax/branches /next/Libraries/Security/Specifications/NotSpecification.cs:10156-10782 /trax/branches/trax-1.0.x/Libraries/Security/Specifications/NotSpecification.cs:10191-10291/trax/branches/upgrade/Libraries/Security /Specifications/NotSpecification.cs:9964-10604 /trax/tags/trax-1.0.0/Libraries/Security/Specifications/NotSpecification.cs:10178-10190 /trax/trunk/Libraries/Security/Specifications/NotSpecification.cs:6672-9851,11324-11327
更改是添加了这一行
/trax/branches/feature3/Libraries/Security/Specifications/NotSpecification.cs:11328-11334
最后一行被修改了
/trax/trunk/Libraries/Security/Specifications/NotSpecification.cs:6672-9851,11324-11327
我预计合并会导致合并零文件. 为什么SVN认为这些文件需要合并并且他们的svn:mergeinfo属性发生了变化？有没有办法纠正这个？
这是我应该删除所有80个文件的svn:mergeinfo属性的情况吗？我在这里和这里暗指.
这个简单的示例是大型调查的一部分,我在其中创建一个功能分支,进行多处更改,然后尝试将更改合并回主干.但是,合并通知我在这80个文件上存在多个树冲突.由于所有这些树冲突,我无法使用SVN分支,这一点非常令人沮丧.
我正在就Ruby语言和环境的.NET(C#)开发团队进行一系列的讨论.我认为这是一个强调Ruby优于C#的好处的机会.首先,我想在进入环境之前专注于语言本身(RoR vs ASP MVC等).您将涵盖Ruby语言的哪些功能？