Microsoft KB Archive/921446

= FIX: The AcceptTheirs option may use an incorrect changeset as the source when you use the Resolve command in Visual Studio 2005 Team Foundation Server =

Article ID: 921446

Article Last Modified on 5/9/2007

-

APPLIES TO


 * Microsoft Visual Studio 2005 Team Foundation Server

-



SYMPTOMS
Consider the following scenario. You use the Resolve command in Microsoft Visual Studio 2005 Team Foundation Server. The Resolve command uses the AcceptTheirs option. In this scenario, the AcceptTheirs option may use an incorrect changeset as the source. For example, a file is merged from a branch (branch A) to a different branch (branch B). A changeset (changeset X) is created on branch B. When the merge from branch B to branch A is performed, a changeset that is earlier than changeset X is used as the source. Therefore, no changes are made to branch A.



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 Visual Studio 2005 Team Foundation Server service pack 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=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
To apply this hotfix, you must have Visual Studio Team Foundation Server Quiescence GDR installed on the computer. To download Visual Studio Team Foundation Server Quiescence GDR, click the following link:

http://www.microsoft.com/downloads/details.aspx?familyid=C18C756E-8F80-4987-B3BF-600068A9E3C4

Restart requirement
You do not have to restart the computer.

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.



STATUS
Microsoft has confirmed that this is a problem in the Microsoft products that are listed in the &quot;Applies to&quot; section.



MORE INFORMATION
For more information, click the following article number to view the article in the Microsoft Knowledge Base:

824684 Description of the standard terminology that is used to describe Microsoft software updates

Keywords: kbhotfixserver kbqfe kbpubtypekc KB921446

-

[mailto:TECHNET@MICROSOFT.COM Send feedback to Microsoft]

© Microsoft Corporation. All rights reserved.