Jump to content


samwise's Content

There have been 1 items by samwise (Search limited from 27-May 19)


By content type

See this member's

Sort by                Order  

#21863 p4merge diff looks wrong for utf-16 files

Posted by samwise on 25 May 2017 - 01:53 AM in P4V

Hi,

I'm diffing a UTF-16 file (a localisation text file) and the highlighted lines are incorrect. The diff looks like this:

p4mergebug.png

it actually varies depending on the size of the p4merge window. The lines that have really changed are a couple of lines below (starting with "Pack/Earn" on the left panel).

The encoding is set to UTF-16 and both files are UTF-16. kdiff correctly shows the diff:


kdiff.png
But I don't want to use kdiff :)

Does anyone have a workaround for this? Is this a known bug? It seems to have been happening for ages (I had a 2015 version installed, and just now upgraded to "Rev. P4Merge/NTX64/2017.1/1491634").

Thanks,
Sam

Attached Thumbnails

  • p4mergebug.png
  • kdiff.png