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

-- 
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/eb12b418-8618-408d-b9ce-a139dd2c8e18%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to