1.11.1 TortoiseMerge "Ignore Comments" has trouble with C-style open block comment in quoted string.

[Duncan Widman]

Hi SVN team.

First, thanks very much for all your work! Really enjoy using the software.

We found an issue with the 'Ignore Comments' feature.

To Test:

Add the following line to a function in a C++ file:

std::string current_parse_problem = "Found a comment close ('*/') with no corresponding open ('/*')";

Diff the file with TortoiseMerge. Enable the 'Ignore Comments' option and note that the diff stops at the above line. The /* inside the string literal seems to be treated as an actual start of a comment block.

Expected behavior is to not treat the /* inside the string literal as the start of a comment block.

Thanks and Best Regards,
Duncan

[Stefan]

Fixed in r28550.

Stefan

[duncan...@gmail.com]

On Saturday, March 30, 2019 at 1:49:48 AM UTC-7, Stefan wrote:
> Fixed in r28550.
>
>
> Stefan

Thanks very much Stefan! Appreciate your efforts!

Best Regards,
Duncan