After you upgrade to TFS 2010, labels are missing items or merge operations perform incorrectly
This article has been archived. It is offered "as is" and will no longer be updated.
After the upgrade to TFS 2010, one or more of the following symptoms may be exhibited:
- Labels that were created before the upgrade are missing files or folders. Labels might be completely empty.
- The Merge wizard in Visual Studio does not display all valid merge targets for a given source path/branch.
- During merging, merge candidates are shown for changes that were already merged before the upgrade.
If a label that was upgraded to 2010 was applied to an item that was renamed at some point in its history, that label will be missing its contents if the labeled version is not the exact changeset in which the rename occurred. These missing items are the result of an incorrect translation of item IDs during the upgrade to the 2010 version.
Any items on a branch that have been renamed multiple times or have had multiple other items occupy their namespace (through add/delete combinations) will have lost their relationships with the corresponding items on other branches. If the item that was renamed was the root of a merge operation (the branch root), the missing relationship will result in the absence of one or more merge targets in the merge wizard. If merging is done through the command line, a message will be returned that states that there is no merge relationship. For renaming of items below the root of the merge operation, the merge wizard will correctly show the merge targets. However, the merge candidates will include changesets that were merged before the upgrade and any new candidates that were added since the last merge. If these candidates are not discarded, the result will be additional merged files and additional merge conflicts. These lost relationships are the result of an incorrect translation of item IDs during the upgrade to the 2010 version.
For the labels with missing items, visit the following website to contact Microsoft Support for help:
To restore the missing merge targets in the merge wizard, a baseless merge must be performed. To do this, run a merge of the following format from a command line for each missing merge target:
tf merge <source branch> <target branch> /baselessFollowing this merge operation, any conflicts that occur will have to be resolved, and then the changes can be checked in. After the merge has been checked in, the merge target will be available from the Merge wizard in Visual Studio.
To resolve the issue with extra merge candidates, the /discard option should be used. To do this, run a merge of the following format from a command line:
tf merge <source branch> <target branch> /r /discard:CXXX~CYYY
In this example, XXX and YYY represent the changeset IDs of the range of changes to discard. After this merge has been checked in, the unwanted candidates will no longer appear for future merges. Also be aware that, because of improvements in the merge algorithm in TFS 2010, items deleted in both the source and target branches will result in changes to be merged. In those cases, it is best not to discard the changesets so that the merge history is updated correctly.
A hotfix has now been released to resolve this issue for databases that have not yet been upgraded to 2010. This hotfix is available from the Microsoft Download Center (http://go.microsoft.com/fwlink/?LinkId=198172), and must be installed as described here:
This hotfix should be applied after TFS 2010 setup is complete but before server configuration begins. At the end of setup, the success screen is displayed that indicates the completion of the installation. Normally, users would continue with configuration, but in this case, the process must be canceled by clearing the Launch Team Foundation Server Configuration Tool box (in the lower-left corner). This action will enable the Cancel button. After setup is exited, the hotfix executable can be run to update the upgrade steps. After the hotfix is installed, the TFS Admin Console must be restarted from the Team Foundation Server command on the Start menu. Selecting the Application Tier node will present the configuration link in the main panel which is used to complete the upgrade process.
Microsoft has confirmed that this is a problem in the Microsoft products that are listed in the "Applies to" section.
TFS Team Foundation Server upgrade merge label branch missing
Article ID: 2135068 - Last Review: 12/12/2015 08:52:25 - Revision: 5.0
Microsoft Visual Studio Team Foundation Server 2010
- kbnosurvey kbarchive kbqfe kbhotfixserver kbsurveynew kbexpertiseadvanced KB2135068