Troubleshooting
Problem
This technote explains why the error, Diff Merge does not support Diff/Merge of UTF8 data, occurs when using IBM Rational ClearCase to perform a diff or merge between versions.
Symptom
A message like the following is reported when attempting to perform a diff or merge between versions.
Diff Merge
"\USX\PrimaryWinClients\SubmitClients\DigitalSubmit.csproj@@\main\MainPage\SmithMain\0" contains UTF8 data.
Diff Merge does not support diff/merge of UTF8 data.
This operation might corrupt the data. Do you want to continue with this operation?
Cause
The warning message is to be expected as explained below.
This is a warning message that was introduced in the following ClearCase versions to resolve APAR PK29914 which was opened to investigate adding the check to see if the file is encoded with UTF8 (and presuming it has UTF8 content ) where the native text diff / merge can potentially corrupt data during merge since it cannot handle UTF8 data.
Resolving The Problem
Defect APAR PK29914 was resolved in the following ClearCase versions:
| ClearCase 7.1 |
| ClearCase 7.0.1 | V 7.0.1.3 |
| ClearCase 7.0 |
In ClearCase version 7.1 and later, if a user wants to avoid this warning message for files with UTF8 encoding, they must create a new type using "utf8_file_delta" type manager and perform a "chtype" on any .csproj elements to this new type. This will invoke the new UTF8 enabled diff / merge which can handle UTF8 encoded files.
Refer to What's New section of the ClearCase 7.1 Release note under the topic of Unicode Transformation Format (UTF) Support for further information.
Related Information
Was this topic helpful?
Document Information
Modified date:
16 June 2018
UID
swg21327045