Re: Bug: TortoiseMerge destroys lines if "ignore whitespace changes" is selected

>> 5) Make sure from TortoiseMerge settings that "ignore whitespace
>> changes" is selected
>> 6) click on line 7 in the "working base" document
>> 7) Right click and from pop up select "Use This Text Block"
>> 8) Press esc
>> 9) TortoiseMerge ask: "Do you want to save your changes?", answer "Yes"
>> 10) open up test_file.c in another editor and you note that line 2 is
>> missing!

>Can you please try a nightly build? I can't reproduce this with my
>latest version.
>
>Stefan

Hello,

I tried with the latest nightly (7725) and I can still reproduce the bug.
Just make sure that you have the TortoiseMerge setting "ignore
whitespace changes" selected from the view-> settings when you do
steps 6-10.

When the bug appears, the test_file.c looks like this:

// line 1
// line 3
// line 4
// line 5
// line 6
// line 7
// line 8

The original "line 2" has disappeared when the change should have only
modified line 7.

Jarmo

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sun Oct 8 12:46:26 2006