| Summary: | ZWNBSP in result file (critical error) | ||
|---|---|---|---|
| Product: | [Applications] kdiff3 | Reporter: | Sergey <agibalovsa> |
| Component: | application | Assignee: | michael <reeves.87> |
| Status: | ASSIGNED --- | ||
| Severity: | normal | CC: | pritykin.amir, s.moderow |
| Priority: | NOR | ||
| Version: | 1.11.4 | ||
| Target Milestone: | --- | ||
| Platform: | Other | ||
| OS: | Microsoft Windows | ||
| Latest Commit: | Version Fixed In: | 1.12 | |
| Sentry Crash Report: | |||
| Attachments: | Files and result, and screenshots | ||
Git commit befbaa8d7a42f4899e04decc740dfb9e48e7d0fc by Michael Reeves. Committed on 16/10/2024 at 02:45. Pushed by mreeves into branch '1.11'. Fix broken merge encoding detection FIXED-IN:1.11.5 M +3 -1 src/SourceData.cpp M +2 -2 src/SourceData.h M +7 -7 src/mergeresultwindow.cpp M +1 -1 src/mergeresultwindow.h https://invent.kde.org/sdk/kdiff3/-/commit/befbaa8d7a42f4899e04decc740dfb9e48e7d0fc Git commit bf576269fe42d7c4832aef60e6ba9b4cc75856d9 by Michael Reeves. Committed on 16/10/2024 at 03:01. Pushed by mreeves into branch 'master'. Fix broken merge encoding detection FIXED-IN:1.11.5 M +3 -1 src/SourceData.cpp M +2 -2 src/SourceData.h M +7 -7 src/mergeresultwindow.cpp M +1 -1 src/mergeresultwindow.h https://invent.kde.org/sdk/kdiff3/-/commit/bf576269fe42d7c4832aef60e6ba9b4cc75856d9 *** Bug 489538 has been marked as a duplicate of this bug. *** Hello! Do you have an estimate for when version 1.11.5 will be released with this fix? Working on that now. Should be up within 24 to 48 hrs. Unfortunately, the fix does not work for me as I just reproduced the issue with Version 1.11.5 (64 bit) on MacOS As a workaround, I added a custom command in Fork at a file level with the following content: perl -i -CSD -pe 's/\x{FEFF}//g' "${file}"
Hello everyone. The fix in version 1.11.5 doesn't work. It likes extra BOM markers are being added. That has been corrected in 1.12/master. UTF-8 without BOM should work as expected for output in 1.11.x. This can be manually set as 'UTF-8' in kdiff3's interface. |
Created attachment 174040 [details] Files and result, and screenshots SUMMARY When I merge 3 files the result is "ZWNBSP" characters which are not in the original files. STEPS TO REPRODUCE 1. Select file1.txt 2. Select file2.txt 3. Select file3.txt 4. Check Combine 5. Select result file OBSERVED RESULT The resulting file contains bad characters. EXPECTED RESULT The resulting file must contain the same tab and newline characters as the source files. SOFTWARE/OS VERSIONS Windows: 10 ADDITIONAL INFORMATION