Microsoft KB Archive/937102

= FIX: The file content may be incorrect after you perform the branch operation and then you perform the merge operation in Visual Studio 2005 Team Foundation Server =

Article ID: 937102

Article Last Modified on 7/21/2007

-

APPLIES TO


 * Microsoft Visual Studio 2005 Team Foundation Server

-



SYMPTOMS
Consider the following scenario. You use version control in Microsoft Visual Studio 2005 Team Foundation Server. You perform the branch operation on a file, and then you perform the merge operation on a file. In this scenario, the file content may be incorrect.



CAUSE
This problem occurs because of a problem in the stored procedures that use a temporary table when you perform the merge operation.



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
You must have Visual Studio 2005 Team Foundation Server Service Pack 1 installed on the computer.

Restart requirement
You do not have to restart the computer.

File information
No files are installed when you apply this hotfix. This hotfix runs a Microsoft SQL Server script that modifies the following objects:
 * The prc_iiPendConflict stored procedure
 * The prc_PendMerge stored procedure
 * The tbl_tmpMerge table



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



Steps to reproduce the problem
 In Microsoft Visual Studio 2005, add a file that is named the Source.txt file to version control. Add a line to the Source.txt file. For example, add some new content to the Source.txt file. Check in the Source.txt file as a pending changeset. Perform a branch operation on the Source.txt file to generate a new file that is named the Target.txt file. Check in the Target.txt file as a pending changeset. Add a line to the Source.txt file. For example, add some new content to the Source.txt file.</li> Check in the Source.txt file as a pending changeset.</li> Edit the Source.txt file, and then note the changeset number. For example, the changeset may be changeset 12.</li> Add a line to the Source.txt file. For example, add some new content to the Source.txt file.</li> Check in the Source.txt file as a pending changeset.</li> Note the changeset number. For example, the changeset may be changeset 20.</li> To merge the Source.txt file and the Target.txt file, run the following command:

merge source.txt target.txt /version:C20~C20

</li> Check in the Target.txt file as a pending changeset.</li> Add a line to the Target.txt file. For example, add some new content to the Target.txt file.</li> Check in the Target.txt file as a pending changeset.</li> To merge the Source.txt file and the Target.txt file, run the following command:

merge source.txt target.txt

You receive an error message that states that a conflict occurred.</li> To resolve the conflict, run the following command:

resolve /auto:acceptTheirs

You expect changeset 20 to be downloaded to the workspace. However, changeset 12 is downloaded to the workspace instead.</li></ol>

For more information about software update terminology, 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: kbfix kbexpertiseadvanced kbpubtypekc kbqfe kbhotfixserver KB937102

-

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

© Microsoft Corporation. All rights reserved.