Multiple items conflict with the same change

Sep 26, 2008 at 11:34 AM
Trying to migrate source control from a TFS2005 server to a TFS2008 server and I'm getting the following error.  Any suggestions?

[20, 2108, 9/26/2008 3:27:53 AM, Migrate] Stopping (overall: 00:00:00.0413569)
TfsMigrationWindowsServiceHost.exe Warning: 0 : Multiple items conflict with the same change
    LogicalOperationStack=
    ThreadId=20
    DateTime=2008-09-26T10:27:53.8597313Z
TfsMigrationWindowsServiceHost.exe Information: 0 : Microsoft.TeamFoundation.Migration.Toolkit.UnresolvableConflictException: Multiple items conflict with the same change
   at Microsoft.TeamFoundation.Migration.Toolkit.ChangeOptimizer.detectConflicts() in C:\Documents and Settings\RBeaubien\Desktop\t2tmtk\Source\Core\Toolkit\VC\ChangeOptimizer.cs:line 96
   at Microsoft.TeamFoundation.Migration.Toolkit.ChangeOptimizer.Resolve() in C:\Documents and Settings\RBeaubien\Desktop\t2tmtk\Source\Core\Toolkit\VC\ChangeOptimizer.cs:line 192
   at Microsoft.TeamFoundation.Migration.Toolkit.BatchingContext.Flush() in C:\Documents and Settings\RBeaubien\Desktop\t2tmtk\Source\Core\Toolkit\VC\BatchingContext.cs:line 284
   at Microsoft.TeamFoundation.Migration.Toolkit.VC.SourceToTfsMigrationEngine.Flush(BatchingContext context) in C:\Documents and Settings\RBeaubien\Desktop\t2tmtk\Source\Core\Toolkit\VC\SourceToTFSMigrationEngine.cs:line 229
   at Microsoft.TeamFoundation.Migration.Toolkit.VC.SourceToTfsMigrationEngine.ProcessChangeGroup(ChangeGrouping group) in C:\Documents and Settings\RBeaubien\Desktop\t2tmtk\Source\Core\Toolkit\VC\SourceToTFSMigrationEngine.cs:line 190
   at Microsoft.Vsts.Rangers.Migration.TfsToTfs.TfsToTfsMigrationEngine.ProcessChangeGroup(ChangeGrouping group) in C:\Documents and Settings\RBeaubien\Desktop\t2tmtk\Source\Adapters\TFS2TFS\VC\TfsToTfsAdapter\TfsToTfsMigrationEngine.cs:line 112
   at Microsoft.TeamFoundation.Migration.Toolkit.VC.VCMigrationEngine.MigrateEach() in C:\Documents and Settings\RBeaubien\Desktop\t2tmtk\Source\Core\Toolkit\VC\MigrationEngine.cs:line 125
   at Microsoft.TeamFoundation.Migration.Toolkit.VC.VCMigrationEngine.Run() in C:\Documents and Settings\RBeaubien\Desktop\t2tmtk\Source\Core\Toolkit\VC\MigrationEngine.cs:line 45
   at Microsoft.TeamFoundation.Migration.Toolkit.VC.SourceToTfsMigrationEngine.Run() in C:\Documents and Settings\RBeaubien\Desktop\t2tmtk\Source\Core\Toolkit\VC\SourceToTFSMigrationEngine.cs:line 85
   at Microsoft.Vsts.Rangers.Migration.TfsToTfs.Session.MigrationThread() in C:\Documents and Settings\RBeaubien\Desktop\t2tmtk\Source\Adapters\TFS2TFS\VC\TfsToTfsAdapter\Session.cs:line 178
    LogicalOperationStack=
    ThreadId=20
    DateTime=2008-09-26T10:27:53.8597313Z
TfsMigrationWindowsServiceHost.exe Information: 0 : VCSession_2008_09_26_03_23_38_551: Multiple items conflict with the same change
    LogicalOperationStack=
    ThreadId=20
    DateTime=2008-09-26T10:27:53.8597313Z
TfsMigrationWindowsServiceHost.exe Warning: 0 : Thread was being aborted.
    LogicalOperationStack=
    ThreadId=21
    DateTime=2008-09-26T10:27:53.8597313Z
TfsMigrationWindowsServiceHost.exe Information: 0 : System.Threading.ThreadAbortException: Thread was being aborted.
   at System.Threading.WaitHandle.WaitOneNative(SafeWaitHandle waitHandle, UInt32 millisecondsTimeout, Boolean hasThreadAffinity, Boolean exitContext)
   at System.Threading.WaitHandle.WaitOne(Int64 timeout, Boolean exitContext)
   at System.Threading.WaitHandle.WaitOne(Int32 millisecondsTimeout, Boolean exitContext)
   at Microsoft.TeamFoundation.VersionControl.Client.Repository.ExecWebServiceRequest(HttpWebRequest request, XmlWriter requestXml, String methodName, HttpWebResponse& response)
   at Microsoft.TeamFoundation.VersionControl.Client.Repository.QueryHistory(String workspaceName, String workspaceOwner, ItemSpec itemSpec, VersionSpec versionItem, String user, VersionSpec versionFrom, VersionSpec versionTo, Int32 maxCount, Boolean includeFiles, Boolean generateDownloadUrls, Boolean slotMode)
   at Microsoft.TeamFoundation.VersionControl.Client.Client.<GetHistoryInternal>d__7.MoveNext()
   at Microsoft.TeamFoundation.VersionControl.Client.Client.<GetHistory>d__0.MoveNext()
   at Microsoft.Vsts.Rangers.Migration.TfsToTfs.TfsToTfsAnalysisEngine.loadEarliestHwmBasedOnMappings(Int32 notBefore, VersionControlSession session) in C:\Documents and Settings\RBeaubien\Desktop\t2tmtk\Source\Adapters\TFS2TFS\VC\TfsToTfsAdapter\TfsToTfsAnalysisEngine.cs:line 146
   at Microsoft.Vsts.Rangers.Migration.TfsToTfs.TfsToTfsAnalysisEngine.getNextChangeId() in C:\Documents and Settings\RBeaubien\Desktop\t2tmtk\Source\Adapters\TFS2TFS\VC\TfsToTfsAdapter\TfsToTfsAnalysisEngine.cs:line 289
   at Microsoft.Vsts.Rangers.Migration.TfsToTfs.TfsToTfsAnalysisEngine.getNextTfsChange() in C:\Documents and Settings\RBeaubien\Desktop\t2tmtk\Source\Adapters\TFS2TFS\VC\TfsToTfsAdapter\TfsToTfsAnalysisEngine.cs:line 297
   at Microsoft.Vsts.Rangers.Migration.TfsToTfs.TfsToTfsAnalysisEngine.Run() in C:\Documents and Settings\RBeaubien\Desktop\t2tmtk\Source\Adapters\TFS2TFS\VC\TfsToTfsAdapter\TfsToTfsAnalysisEngine.cs:line 228
   at Microsoft.Vsts.Rangers.Migration.TfsToTfs.Session.AnalysisThread() in C:\Documents and Settings\RBeaubien\Desktop\t2tmtk\Source\Adapters\TFS2TFS\VC\TfsToTfsAdapter\Session.cs:line 133
    LogicalOperationStack=
    ThreadId=21
    DateTime=2008-09-26T10:27:53.8597313Z
TfsMigrationWindowsServiceHost.exe Warning: 0 : Thread was being aborted.
    LogicalOperationStack=
    ThreadId=21
    DateTime=2008-09-26T10:27:53.8597313Z
TfsMigrationWindowsServiceHost.exe Information: 0 : System.Threading.ThreadAbortException: Thread was being aborted.
   at System.Threading.Thread.AbortInternal()
   at System.Threading.Thread.Abort()
   at Microsoft.Vsts.Rangers.Migration.TfsToTfs.Session.shutdownThread(Thread thread) in C:\Documents and Settings\RBeaubien\Desktop\t2tmtk\Source\Adapters\TFS2TFS\VC\TfsToTfsAdapter\Session.cs:line 104
    LogicalOperationStack=
    ThreadId=21
    DateTime=2008-09-26T10:27:53.8597313Z
TfsMigrationWindowsServiceHost.exe Warning: 0 : Thread was being aborted.
    LogicalOperationStack=
    ThreadId=20
    DateTime=2008-09-26T10:27:53.8697439Z
TfsMigrationWindowsServiceHost.exe Information: 0 : System.Threading.ThreadAbortException: Thread was being aborted.
   at System.Threading.Thread.AbortInternal()
   at System.Threading.Thread.Abort()
   at Microsoft.Vsts.Rangers.Migration.TfsToTfs.Session.shutdownThread(Thread thread) in C:\Documents and Settings\RBeaubien\Desktop\t2tmtk\Source\Adapters\TFS2TFS\VC\TfsToTfsAdapter\Session.cs:line 104
    LogicalOperationStack=
    ThreadId=20
    DateTime=2008-09-26T10:27:53.8697439Z
Developer
Sep 26, 2008 at 2:27 PM
The migration thread throw this exception when it trys to process a changeset for check in to target server. Can you find out which changeset is being migrated?  If the changeset is not too large, can you paste the detailed changeset information?

Thanks,
Pei
Sep 26, 2008 at 4:44 PM
Edited Sep 26, 2008 at 4:46 PM
Changeset1820.jpg

Here is an image to the changeset details.  I wasn't able to find a copy method to get the text directly.  FYI, this used to convert correctly with the previous version of the tfs2tfsmigration tool.  We've just never completed the process due to problems with another project that was started as a branch from this project.
Oct 8, 2008 at 9:46 AM
Any response to this?  I still have the problem.