Article ID: 919449 - View products that this article applies to.
Consider the following scenario. In Microsoft Visual Studio 2005 Team Foundation Server, you use the tf command-line tool to try to resolve pending changes to a file that conflicts with the version of the file on the server. To do this, you use the /auto:AcceptMerge option. In this scenario, the tf command-line tool may enter into an infinite loop. Then, the tf command-line tool may stop responding.
Hotfix informationA 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 Microsoft Visual Studio 2005 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:
PrerequisitesYou must have Visual Studio 2005 Team Foundation Server installed before you apply this hotfix.
Restart requirementYou do not have to restart the computer after you apply this hotfix.
Hotfix replacement informationThis hotfix does not replace any other hotfixes.
File informationThe 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.
Collapse this tableExpand this table
Microsoft has confirmed that this is a problem in the Microsoft products that are listed in the "Applies to" section.
For more information, click the following article number to view the article in the Microsoft Knowledge Base:
824684For more information about the tf command-line tool, visit the following Microsoft Developer Network (MSDN) Web site:
(http://support.microsoft.com/kb/824684/ )Description of the standard terminology that is used to describe Microsoft software updates
http://msdn2.microsoft.com/en-us/library/z51z7zy0(VS.80).aspxFor more information about the resolve command, visit the following MSDN Web site: