Microsoft KB Archive/945482

= FIX: A byte order mark is added to UTF-8 files after you click Auto Merge All in the Resolve Conflicts dialog box in Visual Studio 2005 Team Suite =

Article ID: 945482

Article Last Modified on 12/17/2007

-

APPLIES TO


 * Microsoft Visual Studio 2005 Team Suite

-





SYMPTOMS
When you try to merge UTF-8 files that do not contain a byte order mark, you receive a Resolve Conflicts dialog box. When you click Auto Merge All in the dialog box to resolve the conflict, the byte order mark is added to the UTF-8 files.

Note This problem does not occur if you use a merge tool to resolve the conflict.



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 Team System 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 Team System Service Pack 1 installed to apply this hotfix.

Restart requirement
You do not have to restart the computer after you apply this hotfix.

Hotfix replacement information
This hotfix does not replace any other hotfixes.

File information
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.



Steps to reproduce the problem

 * 1) In Visual Studio 2005 Team Foundation Server Version Control, create a directory.
 * 2) Add a UTF-8 file that does not have a byte order mark to the directory
 * 3) Create a branch of the directory.
 * 4) In the branch, load a copy of the UTF-8 file.
 * 5) Change the file in the directory and the file in the branch so that the files differ.
 * 6) Merge the files in the directory and in the branch. You receive a Resolve Conflicts dialog box.
 * 7) Click Auto Merge All in the dialog box to resolve the conflict.

You notice that the byte order mark is added to the file.

