On 11/10/2017 8:22 PM, Stefan via TortoiseSVN wrote:
Expected behavior:
No error pop up at all.
Note that the incorrect text in the popup adds to the confusion
(i.e. it says that whitespace changes were detected, while
actually only changes in comments were different).
Please understand that IMO there should be no popup at all in this
case. The difference is clearly marked in the TSVNMerge window
(even if ignore comments is set) so there should be little point
in presenting an additional popup on top on all of this.
Yes, that's a bug.
Problem is now, how to fix it. Because as you said, "the difference is
clearly marked ... even if ignore comments is set" - and that's what's
actually wrong. So if I fix this and TMerge would not show any changes
in comments (because it doesn't show non-whitespace changes in
comments, it only shows whitespace changes in ignored comments), I
would also have to show a popup, but then clearly state that there are
changes in comments.
So if I want to fix this right, I /have /to show a popup...
Stefan
Hm... I see... In this case I guess it'd be ok to show the popup with
the corrected message then. Ultimately what I could imagine is a
different behavior when selecting to ignore comments (basically the way
WinMerge handles this case):
- still visualize the changes in comments but in a fainter (i.e. less
bright) color (compared to the normal color marking the diffs)
- when going to next/previous diff, skip over the ignored ones
But I'm sure this is way beyond the scope for a simple bugfix, so
personally I'm fine if a correct popup would be displayed.
--
Regards,
Stefan Hett, Developer/Administrator
EGOSOFT GmbH, Heidestrasse 4, 52146 Würselen, Germany
Tel: +49 2405 4239970, www.egosoft.com
Geschäftsführer: Bernd Lehahn, Handelsregister Aachen HRB 13473
--
You received this message because you are subscribed to the Google Groups
"TortoiseSVN" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/tortoisesvn/880d9b0c-4f81-9c0a-8b16-a177af57abdf%40egosoft.com.
For more options, visit https://groups.google.com/d/optout.
