Consider the following scenario. You use Microsoft Visual Studio 2005 Team Foundation Server for source control. In a source control branch, you change a source code file. Then, you move the file to a newly created folder. After you check in the change set, you merge the source control branch to the original source code file. In this scenario, the changes that you made to the source control branch are not saved to the original source code file.
This issue only occurs if the changes are made in the same change set as the branch operation.
This issue occurs because of a bug in a Microsoft SQL Server stored procedure that is called when you perform a merge operation.
A supported hotfix is available from Microsoft. However, this hotfix is intended to correct only the problem that is described in this article. Apply this hotfix only to systems that are experiencing this specific problem. This hotfix might 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 download this hotfix from the MSDN Code Gallery, visit the following Microsoft Web site:
Note The MSDN Code Gallery displays the languages for which the hotfix is available. If you do not see your language listed, it is because the Code Gallery resource page is not available for that language.
Note If additional issues occur or if any troubleshooting is required, you might have to create a separate service request. The usual support costs will apply to additional support questions and issues that do not qualify for this specific hotfix. For a complete list of Microsoft Customer Service and Support telephone numbers or to create a separate service request, visit the following Microsoft Web site:
You must have Visual Studio Team Foundation Server Service Pack 1 installed on the computer.
You do not have to restart the computer.
This article does not contain a file attributes table because no binaries are actually updated. This hotfix updates some stored procedures.
Microsoft has confirmed that this is a problem in the Microsoft products that are listed in the "Applies to" section.
For a single-server deployment of Visual Studio 2005 Team Foundation Server, apply this hotfix on the server. For a dual-server deployment of Visual Studio 2005 Team Foundation Server, apply this hotfix on the data tier server.
This hotfix does not change any binary assemblies. Additionally, the server side hotfixes of Visual Studio 2005 Team Foundation Server are cumulative.
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