Anything else is a dirty hack and damned to fail at some level. Thus, I think the task of a merge tool should be to merge the binary content. So what is the merge tool supposed to do if you merge a character C from file A in encoding X into a file B in encoding Y, if character C is not part of the character set of encoding Y? Now, the character sets of different encodings do not overlap in general. While this sometimes works, it is also an error prone procedure. Therefore, any program that wants to open the file and display its contents needs to guess the encoding. Unfortunately, by default the encoding of a file is not stored together with the file. I think it really should not be the task of a merge tool to allow the merging of files stored in different encodings.Īn encoding is a function that maps bytes (stored on the disk or in memory) to characters (displayed on screen). The beta version 2.13.22 works just perfectly for me. Update: The above question was for the latest stable 2.12.4. Is there any setting to tell WinMerge that the comparison (I mean the block marking) should be based on Unicode content? It looks as if the initial comparison were based on binary representation of the lines.
See also the following paragraphs that are exactly the same (only the encoding in the sources differ, the same line ending is used). This causes the line marked as different, but the panes below does not mark anyting at the line as different. It has a different representation in the encoded sources. The only character outside of the ASCII range is Ú there.
But the second line has visually the same content. The very first line differs - this is OK. In such case, the two panes below (that show the differences) containt the same text and nothing is marked as different. The red block moves also to those portions of the files. However, the block of text is marked by the dark yellow also in cases when (the Unicode representation of) the text is the same. When moving the red block cursor there, the panes below show the different part. When the lines differ, they are initially marked as block by the dark yellow, and the different portions are marked using the lighter colour. I am using the Unicode version of the WinMerge application (WinMergeU.exe), version 2.12.4.0. Both new and old sources use the same line endings (CR+LF). I need to find differences.ĭetails: The old doc sources use the cp1250 encoding, the new sources use the UTF-8. Large portions of the sources are the same. Motivation: I am rewriting a doc - text files to be processed later.
0 kommentar(er)
