We're using the TFS Integration Tools to migrate our source control history from a TFS 2008 instance to a TFS 2010 instance. The TFS 2008 is an upgraded TFS 2005 instance, which causes a problem. In the discovery phase of the TFS Integration tool we get an error:
[2/23/2011 4:37:50 PM] TfsMigrationShell.exe Information: 0 : VersionControl: Starting analysis of TFS change 5267
[2/23/2011 4:37:50 PM] TfsMigrationShell.exe Information: 0 : VersionControl: Unresolved conflict:
[2/23/2011 4:37:50 PM] Session: dd9ee183-8f17-42e4-acbb-a5bfb0c26d45
[2/23/2011 4:37:50 PM] Source: d95a9917-e8ec-46dd-92bb-86120d0b2a2a
[2/23/2011 4:37:50 PM] Message: Unrecognized conflict type
[2/23/2011 4:37:50 PM] Conflict Type: Unhandled ChangeType conflict type
[2/23/2011 4:37:50 PM] Conflict Type Reference Name: 361cd4e0-9955-42e0-a57c-ec3ade589e77
[2/23/2011 4:37:50 PM] Conflict Details: ChangeType 'Add, Edit, Encoding, Delete' is unrecognized.
This specific checkin is from the TFS 2005 instance; I assume that the "encoding" ChangeType was removed and is not recognized by the TFS 2010 instance. I found only one related comment about this problem, on the TFS Migration and Integration forum, which seems to solve our problem:
To resolve this conflict, you need to map this change combination to one that the migration tool understands. In your situation, the file is added and deleted in the same changeset - I would suggest to map it to 'Delete'.
This wouldn't be a problem, except there's no documentation or examples on how to make this mapping; in fact the last comment on that thread asks that specific question. I'm assuming that this change needs to take place in the XML of the TFS Integration configuration, but how??