Search Wiki:
Article Translations
English, Français, Deutsch, Italiano, 한국어, 繁體中文, 简体中文, 日本語, Русский, Português (Brasil)

Description
A Hotfix is a product update package with one or more updated product files that fix a specific product problem.

IMPORTANT NOTE

Please be aware this Hotfix has not gone through full Microsoft product regression testing nor has it been tested in combination with other Hotfixes.

Please carefully review the associated Hotfix KB article to verify the fix is the one needed and there are no known compatibility or installation issues. You may also want to contact a Microsoft Support Professional at http://support.microsoft.com

Issue Description

FIX: A file that is deleted from the source branch still exists in the target branch after you perform a merge operation in Visual Studio 2008 Team Foundation Server

SYMPTOMS
After you perform a merge operation in Microsoft Visual Studio 2008 Team Foundation Server, a file that is deleted from the source branch still exists in the target branch.

Note: This problem occurs only in special scenarios. For example, consider the following scenario:
• In Visual Studio 2008 Team Foundation Server source control, you create a new folder, and then you name the new folder Trunk.
• In the Trunk folder, you create a new file, you name the new file File.txt, and then you insert a single line of text into the file.
• You check in the changes.
• You branch the Trunk folder as a new branch folder, you name the new branch folder Edit-branch, and then you check in the changes.
• You branch the Trunk folder as a new branch folder, you name the new branch folder Delete-branch, and then you check in the changes.
• In the Delete-branch folder, you delete the File.txt file.
• In the Edit-branch folder, you add another single line of text to the contents of the file.
• You merge the Edit-branch folder to the Trunk folder, and then you check in the changes.
• You merge the Trunk folder to the Delete-branch folder, and then you check in the changes.

Note If a conflict occurs, resolve the conflicts. To do this, click the option to discard the changes from the source branch.
• You check in the changes.
• You merge the Delete-branch folder to the Trunk folder.
• You check the File.txt file in the Trunk folder.
In this scenario, the File.txt file still exists in the Trunk folder. However, the expected behavior is that the File.txt file is deleted.

CAUSE
This problem occurs because an SQL stored procedure is called during the merge operation.


Additional Information about the issue resolved by this Hotfix can be found in its Knowledge Base article at http://support.microsoft.com/kb/947455

Additional Hotfixes
Search the list of all other publicly available Visual Studio and .NET Framework Hotfixes at http://archive.msdn.microsoft.com/Project/ProjectDirectory.aspx?TagName=Hotfix&ProjectSearchText=Hotfix*



Last edited Jun 19 2008 at 1:55 AM  by codegalleryadmin, version 3
Updating...
Page view tracker