FIX: Merge targets are not listed correctly after you upgrade to Visual Studio Team Foundation Server 2010

Symptoms

Consider the following scenario:

  • You upgrade from Microsoft Visual Studio Team Foundation Server 2008 to Microsoft Visual Studio Team Foundation Server 2010.

  • You perform a merge operation between two branches.

  • The target folder or file has been moved or renamed multiple times.

In this scenario, the merge targets are not listed correctly. For example, some target paths that no longer exist are listed. 

Cause

This problem occurs because Team Foundation Server 2010 uses slot mode rather than identity mode to identify branch-target relationships. This means that each file is identified by its path and not by an arbitrary ID. Because of this, renaming or moving the target location multiple times can cause the branch to try to merge to the original location. For example, the branch can try to merge to the location of the first rename.

Resolution

A supported hotfix is now available from Microsoft. However, it is intended to correct only the problem that is described in this article. Apply it only to systems that are experiencing this specific problem. This hotfix may receive additional testing. Therefore, if you are not severely affected by this problem, we recommend that you wait for the next P1 that contains this hotfix.

To resolve this problem immediately, contact Microsoft Customer Support Services to obtain the hotfix. For a complete list of Microsoft Customer Support Services telephone numbers and information about support costs, visit the following Microsoft Web site:

http://support.microsoft.com/contactus/?ws=supportNote In special cases, charges that are ordinarily incurred for support calls may be canceled if a Microsoft Support Professional determines that a specific update will resolve your problem. The usual support costs will apply to additional support questions and issues that do not qualify for the specific update in question.

Prerequisites

You must install the hotfix on the application tier of Microsoft Team Foundation Server 2010.

Restart requirement

You have to restart the computer after you apply the hotfix if the affected files are being used.

Hotfix replacement information

This hotfix package does not replace a previously released hotfix package.

File Information

The English (United States) version of this hotfix package uses a Microsoft Windows Installer package to install the hotfix package. The dates and the times for these files are listed in Coordinated Universal Time (UTC) in the following table. When you view the file information, the date is converted to local time. To find the difference between UTC and local time, use the Time Zone tab in the Date and Time item in Control Panel.

File name

File version

File Size

Date

Time

Platform

Leviewer.exe

10.0.30319.360

117,584

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.admin.dll

10.0.30319.360

19,994,488

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.build.controls.dll

10.0.30319.360

1,349,520

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.build.jobservice.extensions.dll

10.0.30319.360

30,120

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.build.processcomponents.dll

10.0.30319.360

62,880

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.build.server.dll

10.0.30319.360

439,688

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.build.workflow.dll

10.0.30319.360

651,152

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.configuration.commands.dll

10.0.30319.360

262,560

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.framework.server.dll

10.0.30319.360

1,094,544

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.jobservice.extensions.core.dll

10.0.30319.360

58,280

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.jobservice.labmanagerjobs.dll

10.0.30319.360

91,048

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.lab.activities.dll

10.0.30319.360

763,792

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.lab.controller.common.dll

10.0.30319.360

236,448

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.lab.controller.virtualmachinemanagerinterface.dll

10.0.30319.360

83,408

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.lab.execution.dll

10.0.30319.360

757,128

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.lab.leviewer.dll

10.0.30319.360

440,712

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.lab.servicing.dll

10.0.30319.360

58,248

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.lab.testintegration.server.dll

10.0.30319.360

145,832

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.lab.uiutils.dll

10.0.30319.360

266,120

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.lab.workflow.activities.dll

10.0.30319.360

436,640

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.lab.workflowintegration.server.dll

10.0.30319.360

122,800

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.management.controls.dll

10.0.30319.360

2,355,096

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.testmanagement.activities.common.dll

10.0.30319.360

307,128

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.testmanagement.activities.dll

10.0.30319.360

1,509,288

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.testmanagement.activityruntime.dll

10.0.30319.360

214,960

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.testmanagement.client.dll

10.0.30319.360

597,408

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.testmanagement.client.wpfcontrols.dll

10.0.30319.360

254,392

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.testmanagement.clientpackage.dll

10.0.30319.360

72,624

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.testmanagement.common.dll

10.0.30319.360

33,696

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.testmanagement.controller.dll

10.0.30319.360

119,720

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.testmanagement.controls.dll

10.0.30319.360

417,184

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.testmanagement.controls.wpfworkitemcontrols.dll

10.0.30319.360

99,280

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.versioncontrol.client.dll

10.0.30319.360

692,640

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.versioncontrol.common.dll

10.0.30319.360

229,792

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.versioncontrol.controls.dll

10.0.30319.360

4,435,872

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.versioncontrol.server.dll

10.0.30319.360

611,232

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.webaccess.controls.dll

10.0.30319.360

618,392

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.webaccess.server.dll

10.0.30319.360

486,800

19-Sep-2010

09:14

x86

Microsoft.teamfoundation.workitemtracking.server.dataaccesslayer.dll

10.0.30319.360

587,720

19-Sep-2010

09:14

x86

Microsoft.visualstudio.qualitytools.common.dll

10.0.30319.360

1,332,624

19-Sep-2010

09:14

x86

Microsoft.visualstudio.qualitytools.controllerobject.dll

10.0.30319.360

273,832

19-Sep-2010

09:14

x86

Microsoft.visualstudio.qualitytools.executioncommon.dll

10.0.30319.360

448,936

19-Sep-2010

09:14

x86

Microsoft.visualstudio.qualitytools.resource.dll

10.0.30319.360

958,872

19-Sep-2010

09:14

x86

Microsoft.visualstudio.qualitytools.vsip.dll

10.0.30319.360

349,072

19-Sep-2010

09:14

x86

Microsoft.visualstudio.testtools.datacollection.videorecorder.dll

10.0.30319.360

60,352

19-Sep-2010

09:14

x86

Microsoft.visualstudio.testtools.manualtest.common.dll

10.0.30319.360

810,408

19-Sep-2010

09:14

x86

Tfsbuildservicehost.exe

10.0.30319.360

190,312

19-Sep-2010

09:14

x86

Tfsconfig.exe

10.0.30319.360

43,344

19-Sep-2010

09:14

x86

Tfslabconfig.exe

10.0.30319.360

113,496

19-Sep-2010

09:14

x86

Status

Microsoft has confirmed that this is a problem in the Microsoft products that are listed in the "Applies to" section.

Need more help?

Expand your skills
Explore Training
Get new features first
Join Microsoft Insiders

Was this information helpful?

Thank you for your feedback!

Thank you for your feedback! It sounds like it might be helpful to connect you to one of our Office support agents.

×