Microsoft KB Archive Search

Notice: This website is an unofficial Microsoft Knowledge Base (hereinafter KB) archive and is intended to provide a reliable access to deleted content from Microsoft KB. All KB articles are owned by Microsoft Corporation. Read full disclaimer for more details.

  1. Home
  2. FIX: The "Resolve version conflict" dialog box displays incorrect options and an unclear status in Team Foundation Server 2010

FIX: The "Resolve version conflict" dialog box displays incorrect options and an unclear status in Team Foundation Server 2010

View products that this article applies to.

Symptoms

A hotfix that fixes the following issues is available for Team Foundation Server 2010.

Issue 1

Consider the following scenario:
  • You perform a merge operation in source control for Team Foundation Server 2010.
  • You edit the file in the source branch, and then you rename the file in the target branch.
In this scenario, the options that are displayed in the Resolve version conflict dialog box are incorrect.

For example, the Resolve version conflict dialog box contains only the Keep Target Branch Version option and the Take Source Branch Version option.

Issue 2

Consider the following scenario:
  • You perform a merge operation in source control for Team Foundation Server 2010.
  • You edit the file in the source branch, and then you delete the file in the target branch.
In this scenario, the Resolve version conflict dialog box displays the status as “Item content has changed” instead of “Item was deleted in the target branch.”

Note After you apply the hotfix, the Resolve version conflict dialog box displays the status as “Item was deleted in the target branch.” This status description is much clearer.

↑ Back to the top

Resolution

Hotfix information

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 software update 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 website:
http://support.microsoft.com/contactus/?ws=support
Note 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 the Team Foundation Server 2010 server.

Restart requirement

You do not have to restart the computer after you install the hotfix.

Hotfix replacement information

This hotfix does not replace any other hotfixes.

File information

The English version of this hotfix has the file attributes (or later file attributes) that are listed in the following table. The dates and times for these files are listed in Coordinated Universal Time (UTC). When you view the file information, it 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 nameFile versionFile sizeDateTimePlatform
Leviewer.exe10.0.30319.360117,58419-Sep-201009:14x86
Microsoft.teamfoundation.admin.dll10.0.30319.36019,994,48819-Sep-201009:14x86
Microsoft.teamfoundation.build.controls.dll10.0.30319.3601,349,52019-Sep-201009:14x86
Microsoft.teamfoundation.build.jobservice.extensions.dll10.0.30319.36030,12019-Sep-201009:14x86
Microsoft.teamfoundation.build.processcomponents.dll10.0.30319.36062,88019-Sep-201009:14x86
Microsoft.teamfoundation.build.server.dll10.0.30319.360439,68819-Sep-201009:14x86
Microsoft.teamfoundation.build.workflow.dll10.0.30319.360651,15219-Sep-201009:14x86
Microsoft.teamfoundation.configuration.commands.dll10.0.30319.360262,56019-Sep-201009:14x86
Microsoft.teamfoundation.framework.server.dll10.0.30319.3601,094,54419-Sep-201009:14x86
Microsoft.teamfoundation.jobservice.extensions.core.dll10.0.30319.36058,28019-Sep-201009:14x86
Microsoft.teamfoundation.jobservice.labmanagerjobs.dll10.0.30319.36091,04819-Sep-201009:14x86
Microsoft.teamfoundation.lab.activities.dll10.0.30319.360763,79219-Sep-201009:14x86
Microsoft.teamfoundation.lab.controller.common.dll10.0.30319.360236,44819-Sep-201009:14x86
Microsoft.teamfoundation.lab.controller.virtualmachinemanagerinterface.dll10.0.30319.36083,40819-Sep-201009:14x86
Microsoft.teamfoundation.lab.execution.dll10.0.30319.360757,12819-Sep-201009:14x86
Microsoft.teamfoundation.lab.leviewer.dll10.0.30319.360440,71219-Sep-201009:14x86
Microsoft.teamfoundation.lab.servicing.dll10.0.30319.36058,24819-Sep-201009:14x86
Microsoft.teamfoundation.lab.testintegration.server.dll10.0.30319.360145,83219-Sep-201009:14x86
Microsoft.teamfoundation.lab.uiutils.dll10.0.30319.360266,12019-Sep-201009:14x86
Microsoft.teamfoundation.lab.workflow.activities.dll10.0.30319.360436,64019-Sep-201009:14x86
Microsoft.teamfoundation.lab.workflowintegration.server.dll10.0.30319.360122,80019-Sep-201009:14x86
Microsoft.teamfoundation.management.controls.dll10.0.30319.3602,355,09619-Sep-201009:14x86
Microsoft.teamfoundation.testmanagement.activities.common.dll10.0.30319.360307,12819-Sep-201009:14x86
Microsoft.teamfoundation.testmanagement.activities.dll10.0.30319.3601,509,28819-Sep-201009:14x86
Microsoft.teamfoundation.testmanagement.activityruntime.dll10.0.30319.360214,96019-Sep-201009:14x86
Microsoft.teamfoundation.testmanagement.client.dll10.0.30319.360597,40819-Sep-201009:14x86
Microsoft.teamfoundation.testmanagement.client.wpfcontrols.dll10.0.30319.360254,39219-Sep-201009:14x86
Microsoft.teamfoundation.testmanagement.clientpackage.dll10.0.30319.36072,62419-Sep-201009:14x86
Microsoft.teamfoundation.testmanagement.common.dll10.0.30319.36033,69619-Sep-201009:14x86
Microsoft.teamfoundation.testmanagement.controller.dll10.0.30319.360119,72019-Sep-201009:14x86
Microsoft.teamfoundation.testmanagement.controls.dll10.0.30319.360417,18419-Sep-201009:14x86
Microsoft.teamfoundation.testmanagement.controls.wpfworkitemcontrols.dll10.0.30319.36099,28019-Sep-201009:14x86
Microsoft.teamfoundation.versioncontrol.client.dll10.0.30319.360692,64019-Sep-201009:14x86
Microsoft.teamfoundation.versioncontrol.common.dll10.0.30319.360229,79219-Sep-201009:14x86
Microsoft.teamfoundation.versioncontrol.controls.dll10.0.30319.3604,435,87219-Sep-201009:14x86
Microsoft.teamfoundation.versioncontrol.server.dll10.0.30319.360611,23219-Sep-201009:14x86
Microsoft.teamfoundation.webaccess.controls.dll10.0.30319.360618,39219-Sep-201009:14x86
Microsoft.teamfoundation.webaccess.server.dll10.0.30319.360486,80019-Sep-201009:14x86
Microsoft.teamfoundation.workitemtracking.server.dataaccesslayer.dll10.0.30319.360587,72019-Sep-201009:14x86
Microsoft.visualstudio.qualitytools.common.dll10.0.30319.3601,332,62419-Sep-201009:14x86
Microsoft.visualstudio.qualitytools.controllerobject.dll10.0.30319.360273,83219-Sep-201009:14x86
Microsoft.visualstudio.qualitytools.executioncommon.dll10.0.30319.360448,93619-Sep-201009:14x86
Microsoft.visualstudio.qualitytools.resource.dll10.0.30319.360958,87219-Sep-201009:14x86
Microsoft.visualstudio.qualitytools.vsip.dll10.0.30319.360349,07219-Sep-201009:14x86
Microsoft.visualstudio.testtools.datacollection.videorecorder.dll10.0.30319.36060,35219-Sep-201009:14x86
Microsoft.visualstudio.testtools.manualtest.common.dll10.0.30319.360810,40819-Sep-201009:14x86
Tfsbuildservicehost.exe10.0.30319.360190,31219-Sep-201009:14x86
Tfsconfig.exe10.0.30319.36043,34419-Sep-201009:14x86
Tfslabconfig.exe10.0.30319.360113,49619-Sep-201009:14x86

↑ Back to the top

Status

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

↑ Back to the top

Keywords: kbqfe, kbhotfixserver, kbfix, kbsurveynew, kbhotfixdev, kbexpertiseadvanced, kb

↑ Back to the top

Article Info
Article ID : 2402012
Revision : 2
Created on : 9/25/2018
Published on : 9/25/2018
Exists online : False
Views : 128