Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignoring carriage return differences doesn't work anymore #2080

Closed
rondlh opened this issue Oct 29, 2023 · 9 comments
Closed

Ignoring carriage return differences doesn't work anymore #2080

rondlh opened this issue Oct 29, 2023 · 9 comments

Comments

@rondlh
Copy link

rondlh commented Oct 29, 2023

Since Winmerge 2.16.33 "ignoring carriage return differences" doesn't work anymore.
The files with only carriage return differences get marked as different, then when clicked the files are reported to be identical. This worked fine for 2.16.32, where the files just didn't get marked as different.

@sdottaka
Copy link
Member

Could you please try version 2.16.34?
Also, if the folder compare method is other than Full Contents, try comparing with Full Contents.

@rondlh
Copy link
Author

rondlh commented Oct 30, 2023

Could you please try version 2.16.34? Also, if the folder compare method is other than Full Contents, try comparing with Full Contents.

2.16.34 has the same problem, "compare method" is set to "Full Contents".
Files are marked as "different“, when opened the files are reported to be "identical".
Left file is "Windows (CRLF)", right file is "Unix (LF)", ignoring carriage return differences is checked.

@sdottaka
Copy link
Member

Thank you for checking version 2.16.34.
This problem does not currently occur in my environment.
Is it possible for you to attach the files that cause the problem?

@rondlh
Copy link
Author

rondlh commented Oct 31, 2023

In WinMerge 2.16.32 all files are shown to be identical in the file/folder view.
WinMerge 2 16 32
In WinMerge 2.16.34 all files are shown to be different in the file/folder view, but when opened they are reported to be identical.
WinMerge 2 16 34

Here are the files: TEST.zip
I also compared the files based on this ZIP-file. It should show the problem, if not then perhaps there is something wrong in my registry.

@sdottaka
Copy link
Member

Thank you for attaching the file.
I was able to reproduce this issue by clearing the registry data.
This problem can be avoided by enabling the line filter and registering some pattern.
I'll try to fix it later.

@sdottaka
Copy link
Member

sdottaka commented Nov 2, 2023

Fixed by commit e1709e5
Thank you for your report.
The latest build artifacts can be downloaded below.

https://ci.appveyor.com/project/sdottaka/winmerge/build/artifacts

@sdottaka sdottaka added this to the v2.16.35 milestone Nov 2, 2023
@vittoso
Copy link

vittoso commented Nov 3, 2023

Hello!
It seems to me there is a very similar bug in 2.16.34.0 if files differ only by Tab or whitespaces indentation.
Here's the compare options:
image

Here's some example files TEST_TAB_SPACES.zip the files are shown to be different in the file/folder view, but when opened they are reported to be identical.

This seems to happen with the "default" Diff algorithm. The "minimal" algorithm seems to recognize that the files are not different also in file/folder view.

@sdottaka
Copy link
Member

sdottaka commented Nov 4, 2023

@vittoso
Thank you for your report.
An issue where space differences were not ignored was also fixed in commit e1709e5.
https://ci.appveyor.com/project/sdottaka/winmerge/build/artifacts

@sdottaka
Copy link
Member

We have released version 2.16.36 which includes a fix for this issue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants