winmerge icon indicating copy to clipboard operation
winmerge copied to clipboard

Filtereinstellung

Open Ralf1508 opened this issue 6 months ago • 9 comments

Um die Satznummern z.B. N690 usw. nicht als wichtigen Unterschied darstellen zu lassen habe ich den Filter N gesetzt. Leider wird dadurch der Unterschied in Satznummer N690 für S2=140 und S2=120 nicht erkannt.

Was für einen Filter müsste ich setzen, damit die Satznummern mit N nicht verglichen werden, aber der nachfolgende Inhalt der Zeile schon?

N690 G96 S2=140 F0.5 M2=4 N350 G96 S2=120 F0.5 M2=4

N690 und N350 als Unterschied ignorieren, aber G96 S2=140 F0.5 M2=4 auf einen Unterschied überprüfen.

Vielen Dank

Image

Ralf1508 avatar May 27 '25 08:05 Ralf1508

You can define a Substitutions filter like ^N\d+ to replace Nxxx with an empty string.

Image

sdottaka avatar May 27 '25 11:05 sdottaka

Thank you very much for this helpful solution.

But another question is, why WinMerge ignores the different N-numbers until row 90, but marks the differences down row 97?

Best regards

Image

Ralf1508 avatar Jun 02 '25 07:06 Ralf1508

I tried creating a text like the one in your screenshot and compared it, but I couldn't reproduce the issue. Could you please attach the files you compared? Also, please share your Substitutions filter settings.

Image

sdottaka avatar Jun 02 '25 11:06 sdottaka

Hello and thank you very much for your help.

Attached two files to compare.

Everything is fine from line 33 until 54 because the different N-numbers are recognized but marked only bright yellow. The same from line 59 until 90

But from line 97 until 124 there are also different N-numbers but the difference is marked dark yellow as important differences. I would expect, that only line 110 will be dark yellow, because of the difference S2=140 and S2=120

And here’s are my substitutions filter settings, like you told me to do:

@.***

@.***

Best regards

Ralf Erhard

Von: Takashi Sawanaka @.> Gesendet: Montag, 2. Juni 2025 13:39 An: WinMerge/winmerge @.> Cc: Erhard, Ralf @.>; Author @.> Betreff: [EXT] Re: [WinMerge/winmerge] Filtereinstellung (Issue #2797)

*** CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender and know the content is safe. ***

[https://avatars.githubusercontent.com/u/98126?s=20&v=4]sdottaka left a comment (WinMerge/winmerge#2797)https://github.com/WinMerge/winmerge/issues/2797#issuecomment-2930206810

I tried creating a text like the one in your screenshot and compared it, but I couldn't reproduce the issue. Could you please attach the files you compared? Also, please share your Substitutions filter settings.

image.png (view on web)https://github.com/user-attachments/assets/cb6ec8f8-8b8b-469c-89b1-75c0da4cb41c

— Reply to this email directly, view it on GitHubhttps://github.com/WinMerge/winmerge/issues/2797#issuecomment-2930206810, or unsubscribehttps://github.com/notifications/unsubscribe-auth/BS5QL4U5QMYDJUFGCLJMFWT3BQZWPAVCNFSM6AAAAAB57MRNMKVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDSMZQGIYDMOBRGA. You are receiving this because you authored the thread.Message ID: @.@.>>

Ralf1508 avatar Jun 03 '25 09:06 Ralf1508

It seems that the attachments and substitution filter settings were lost in the email. Also, the substitution filters are shown as ***@***.***

Could you please reply directly on the GitHub issue via the web browser instead of by email?

sdottaka avatar Jun 03 '25 11:06 sdottaka

Ah, I forgot that you might be using an older version of WinMerge.

If you're not using the latest version of WinMerge, please update to the latest version. In older versions, if a Diff hunk contains any line that cannot be ignored after applying the Substitution filter, the entire hunk is shown as different.

sdottaka avatar Jun 03 '25 15:06 sdottaka

Now I use the Version 2.16.46.0 but there's no improvement for the result.

Image

Ralf1508 avatar Jun 12 '25 12:06 Ralf1508

Could you try using version 2.16.48.2?

sdottaka avatar Jun 12 '25 13:06 sdottaka

Yes, I tried using version 2.16.48.2 and now it's working like I expected. Thank you very much for your help.

Ralf1508 avatar Jun 17 '25 08:06 Ralf1508