0

我一直在使用 TFS 集成服务将我们的主要项目集从 TFS 2010 上的团队系统（我知道，我知道）的 Scrum 移动到同一服务器上的 Microsoft Agile 5.0。所有工作项都已正常迁移，我上周一直在迁移 VC 项。该服务声称所有内容都已迁移，但我错过了十几个分支，无论我重新启动多少次，我都无法让它迁移其余部分。

我有哪些选择？我是否必须销毁新项目并从头开始，还是新的集成会这样做？

<?xml version="1.0" encoding="utf-16"?>
<Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" UniqueId="4a01478e-1ba7-4c62-8925-714739e1fab6" FriendlyName="TFS to TFS Version Control and Work Item Tracking with Links">
  <Providers>
    <Provider ReferenceName="febc091f-82a2-449e-aed8-133e5896c47a" FriendlyName="TFS 2010 Migration VC Provider" />
    <Provider ReferenceName="04201d39-6e47-416f-98b2-07f0013f8455" FriendlyName="TFS 2010 Migration WIT Provider" />
  </Providers>
  <Addins />
  <SessionGroup CreationTime="2013-09-24T11:28:46.567+01:00" FriendlyName="TFS to TFS Version Control and Work Item Tracking with Links" SessionGroupGUID="a3d4e2fe-3b6c-4d20-a9c3-e5adf35567bb" Creator="MDLIMITED\damien.ryan" SyncIntervalInSeconds="0" SyncDurationInMinutes="0">
    <MigrationSources>
      <MigrationSource InternalUniqueId="ea1112aa-8b29-4249-b5ad-a56d9e3d4cde" FriendlyName="<SERVER> (VC)" ServerIdentifier="b0584010-6dfd-4ecd-95b5-f7bacdfcf0d7" ServerUrl="http://<SERVER>:8080/tfs/defaultcollection" SourceIdentifier="RCM" ProviderReferenceName="febc091f-82a2-449e-aed8-133e5896c47a">
        <Settings>
          <Addins />
          <UserIdentityLookup />
          <DefaultUserIdProperty UserIdPropertyName="DisplayName" />
        </Settings>
        <CustomSettings />
        <StoredCredential />
      </MigrationSource>
      <MigrationSource InternalUniqueId="9f1fc9e6-6a37-4c2e-9ca8-336897850317" FriendlyName="<SERVER> (VC)" ServerIdentifier="b0584010-6dfd-4ecd-95b5-f7bacdfcf0d7" ServerUrl="http://<SERVER>:8080/tfs/defaultcollection" SourceIdentifier="RCM_Platform" ProviderReferenceName="febc091f-82a2-449e-aed8-133e5896c47a">
        <Settings>
          <Addins />
          <UserIdentityLookup />
          <DefaultUserIdProperty UserIdPropertyName="DisplayName" />
        </Settings>
        <CustomSettings />
        <StoredCredential />
      </MigrationSource>
      <MigrationSource InternalUniqueId="38c2d113-700b-4bc6-ab36-a3c304ac8bc3" FriendlyName="<SERVER> (WIT)" ServerIdentifier="b0584010-6dfd-4ecd-95b5-f7bacdfcf0d7" ServerUrl="http://<SERVER>:8080/tfs/defaultcollection" SourceIdentifier="RCM" ProviderReferenceName="04201d39-6e47-416f-98b2-07f0013f8455">
        <Settings>
          <Addins />
          <UserIdentityLookup />
          <DefaultUserIdProperty UserIdPropertyName="DisplayName" />
        </Settings>
        <CustomSettings />
        <StoredCredential />
      </MigrationSource>
      <MigrationSource InternalUniqueId="089ca660-2cd3-4a25-a0ae-ad0d9004723c" FriendlyName="<SERVER> (WIT)" ServerIdentifier="b0584010-6dfd-4ecd-95b5-f7bacdfcf0d7" ServerUrl="http://<SERVER>:8080/tfs/defaultcollection" SourceIdentifier="RCM_Platform" ProviderReferenceName="04201d39-6e47-416f-98b2-07f0013f8455">
        <Settings>
          <Addins />
          <UserIdentityLookup />
          <DefaultUserIdProperty UserIdPropertyName="DisplayName" />
        </Settings>
        <CustomSettings />
        <StoredCredential />
      </MigrationSource>
    </MigrationSources>
    <Sessions>
      <Session CreationTime="2013-09-24T11:28:46.557+01:00" SessionUniqueId="2325d8e9-ed67-473d-acd8-86301e867ec6" FriendlyName="Version Control Session" LeftMigrationSourceUniqueId="ea1112aa-8b29-4249-b5ad-a56d9e3d4cde" RightMigrationSourceUniqueId="9f1fc9e6-6a37-4c2e-9ca8-336897850317" SessionType="VersionControl">
        <EventSinks />
        <CustomSettings>
          <SettingXml />
          <SettingXmlSchema />
        </CustomSettings>
        <Filters>
          <FilterPair Neglect="false">
            $/<FilterItem MigrationSourceUniqueId="ea1112aa-8b29-4249-b5ad-a56d9e3d4cde" FilterString="<FROMPROJ> />
            <FilterItem MigrationSourceUniqueId="9f1fc9e6-6a37-4c2e-9ca8-336897850317" FilterString="<TOPROJ>" />
          </FilterPair>
          <FilterPair Neglect="true">
            <FilterItem MigrationSourceUniqueId="ea1112aa-8b29-4249-b5ad-a56d9e3d4cde" FilterString="$/RCM/BuildProcessTemplates" />
            <FilterItem MigrationSourceUniqueId="9f1fc9e6-6a37-4c2e-9ca8-336897850317" FilterString="<TOPROJ>/BuildProcessTemplates" />
          </FilterPair>
        </Filters>
      </Session>
      <Session CreationTime="2013-09-24T11:28:46.567+01:00" SessionUniqueId="2f6ea511-a24a-4e09-9166-dc9c45a4b7be" FriendlyName="Work Item Tracking Session" LeftMigrationSourceUniqueId="38c2d113-700b-4bc6-ab36-a3c304ac8bc3" RightMigrationSourceUniqueId="089ca660-2cd3-4a25-a0ae-ad0d9004723c" SessionType="WorkItemTracking">
        <EventSinks />
        <CustomSettings>
          <SettingXml>
            <WITSessionCustomSetting>
              <Settings />
              <WorkItemTypes>
                <WorkItemType LeftWorkItemTypeName="Bug" RightWorkItemTypeName="Bug" fieldMap="BugToBug" />
                <WorkItemType LeftWorkItemTypeName="Sprint Backlog Item" RightWorkItemTypeName="Task" fieldMap="SBIToTask" />
                <WorkItemType LeftWorkItemTypeName="Product Backlog Item" RightWorkItemTypeName="User Story" fieldMap="PBIToUserStory" />
              </WorkItemTypes>
              <FieldMaps>
                <FieldMap name="BugToBug">
                  <MappedFields>
                    <MappedField LeftName="*" RightName="*" MapFromSide="Left" valueMap="" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.EstimatedEffort" RightName="" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.WorkRemaining" RightName="" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.Build.Environment" RightName="" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.TestingImpact" RightName="" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.DateDiscovered" RightName="" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.DateClosed" RightName="" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.Team" RightName="" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.BusinessPriority" RightName="" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.DeliveryOrder" RightName="" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.HistoryDate" RightName="" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.ReplicationActionDetail" RightName="" MapFromSide="Left" />
                  </MappedFields>
                  <AggregatedFields />
                  <UserIdentityFields>
                    <LeftUserIdentityFields />
                    <RightUserIdentityFields />
                  </UserIdentityFields>
                </FieldMap>
                <FieldMap name="SBIToTask">
                  <MappedFields>
                    <MappedField LeftName="*" RightName="*" MapFromSide="Left" valueMap="" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.EstimatedEffort" RightName="Microsoft.VSTS.Scheduling.OriginalEstimate" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.WorkRemaining" RightName="Microsoft.VSTS.Scheduling.RemainingWork" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.Team" RightName="" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.HistoryDate" RightName="" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.TaskPriority" RightName="Microsoft.VSTS.Common.StackRank" MapFromSide="Left" />
                  </MappedFields>
                  <AggregatedFields />
                  <UserIdentityFields>
                    <LeftUserIdentityFields />
                    <RightUserIdentityFields />
                  </UserIdentityFields>
                </FieldMap>
                <FieldMap name="PBIToUserStory">
                  <MappedFields>
                    <MappedField LeftName="*" RightName="*" MapFromSide="Left" valueMap="" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.EstimatedEffort" RightName="Microsoft.VSTS.Scheduling.StoryPoints" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.WorkRemaining" RightName="" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.Team" RightName="" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.BusinessPriority" RightName="Microsoft.VSTS.Common.StackRank" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.DeliveryOrder" RightName="" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.HistoryDate" RightName="" MapFromSide="Left" />
                    <MappedField LeftName="Conchango.TeamSystem.Scrum.ConditionsOfAcceptance" RightName="" MapFromSide="Left" />
                  </MappedFields>
                  <AggregatedFields />
                  <UserIdentityFields>
                    <LeftUserIdentityFields />
                    <RightUserIdentityFields />
                  </UserIdentityFields>
                </FieldMap>
              </FieldMaps>
              <ValueMaps />
            </WITSessionCustomSetting>
          </SettingXml>
          <SettingXmlSchema />
        </CustomSettings>
        <Filters>
          <FilterPair Neglect="false">
            <FilterItem MigrationSourceUniqueId="38c2d113-700b-4bc6-ab36-a3c304ac8bc3" FilterString="[System.AreaPath] UNDER '<AREAPATH>/>'" />
            <FilterItem MigrationSourceUniqueId="089ca660-2cd3-4a25-a0ae-ad0d9004723c" FilterString="[System.Id] = 0" />
          </FilterPair>
        </Filters>
      </Session>
    </Sessions>
    <Linking>
      <CustomSettings />
      <LinkTypeMappings />
    </Linking>
    <WorkFlowType Frequency="ContinuousManual" DirectionOfFlow="Unidirectional" SyncContext="Disabled" />
    <CustomSettings />
    <UserIdentityMappings EnableValidation="false">
      <UserIdentityLookupAddins />
    </UserIdentityMappings>
    <ErrorManagement>
      <ErrorRouters />
      <ReportingSettings />
    </ErrorManagement>
  </SessionGroup>
</Configuration>

编辑：从日志中添加了一个选择，以显示正在分析变更集，创建迁移指令，但未提交。

我按照您的建议添加了 MergeScope 参数，并且应用程序的工作方式没有变化。

如果您查看日志，它会尝试针对以后的变更集挂起操作，但这些操作永远不会提交给 TFS：

[16/10/2013 17:34:22] TfsIntegrationService.exe Information: 0 : VersionControl: Starting analysis of TFS change 78046 
[16/10/2013 17:34:22] TfsIntegrationService.exe Information: 0 : VersionControl: Created 1 actions for TFS change 78046 
[16/10/2013 17:34:22] TfsIntegrationService.exe Information: 0 : VersionControl: Analyzing TFS change 78124 : 24/24 
[16/10/2013 17:34:22] TfsIntegrationService.exe Information: 0 : VersionControl: Starting analysis of TFS change 78124 
[16/10/2013 17:34:22] TfsIntegrationService.exe Information: 0 : VersionControl: Created 1 actions for TFS change 78124 
[16/10/2013 17:34:22] TfsIntegrationService.exe Information: 0 : VersionControl: Generating migration instructions for the migration source 9f1fc9e6-6a37-4c2e-9ca8-336897850317

...

[16/10/2013 17:47:22] TfsIntegrationService.exe Information: 0 : VersionControl: Generating migration instruction for ChangeGroup 1922014 
[16/10/2013 17:47:22] TfsIntegrationService.exe Information: 0 : VersionControl: Starting basic conflict detection 
[16/10/2013 17:47:56] TfsIntegrationService.exe Information: 0 : VersionControl: Finishing basic conflict detection 
[16/10/2013 17:47:56] TfsIntegrationService.exe Information: 0 : VersionControl: Loading 50 ChangeGroup(s) 
[16/10/2013 17:47:56] TfsIntegrationService.exe Information: 0 : VersionControl: Post-processing delta table entries from the migration source 9f1fc9e6-6a37-4c2e-9ca8-336897850317 
[16/10/2013 17:47:56] TfsIntegrationService.exe Information: 0 : VersionControl: Marking as 'DeltaComplete' the target-side delta table for uni-directional session 
[16/10/2013 17:47:57] TfsIntegrationService.exe Information: 0 : VersionControl: Migrating to the migration source 9f1fc9e6-6a37-4c2e-9ca8-336897850317
4

1 回答 1

2

@Gutwulf，您是否在日志文件中看到与您缺少的分支相关的任何异常、警告或消息？你能分享配置和日志文件吗？如果紧急，请考虑拨打http://blogs.msdn.com/b/willy-peter_schaub/archive/2011/06/06/toc-tfs-integration-tools-blog-posts-and-reference中所述的支持电话-sites.aspx。

于 2013-10-08T16:46:52.103 回答