TMerge doesn't appear to be ignoring case changes when the setting to do so
is set. It colors them with a different color, and removes the "-" and "+"
indicators, but when I press the "Next Difference" button, it still stops on
that line.
The information from Help->About:
TortoiseMerge 1.3.5, Build 6804 - 32 Bit
libsvn_diff 1.3.2,
apr 0.9.7
apr-iconv 0.9.7
apr-utils 0.9.7
To reproduce, open a DOS box, create a temporary directory, change to that
directory, and do the following:
echo This is line 01 > test1.txt
echo This is line 02 >> test1.txt
echo This is line 03 >> test1.txt
echo This is line 04 >> test1.txt
echo This is line 05 >> test1.txt
echo This is line 01 > test2.txt
echo This is line 02 >> test2.txt
echo This is LINE 03 >> test2.txt
echo This is line 4 >> test2.txt
echo This is line 05 >> test2.txt
Start Windows Explorer in that directory, highlight the two files,
right-click, and select SVN Diff from the menu. It will properly show that
lines 2, 3 and line 4 are the only differences between the files, on my
system they are colored in orange on the right and yellow on the left, along
with a "-" sign on the right side and a "+" on the right. The "Next
Difference" button properly moves to line 2, then 3, then 4. Now select
View->Settings and check the "Ignore case changes" box. Exit TMerge.
Highlight the files again, right-click and select SVN Diff again. Verify
that the setting is still set, and note that lines 2 and 4 are still shown
as differences. Line 3 is still highlighted, though in blue, and without
the "-" and "+" signs. However, contrary to my expectations, pressing the
"Next Difference" button still results in the difference indicator stopping
at line 3 after stopping at line 2. Based on the verbiage "Ignore case
changes", I would have expected it to pass line 3 by and go directly to line
4.
Are my expectations wrong?
Thanks,
Brad
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Jun 27 01:51:32 2006