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

Jarmo Torvinen wrote:

> 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.

Thanks for not giving up - I should have read your first mail more
carefully: I had line 2 a little different than you, so I didn't loose
that line :)

Fixed in revision 7737, backported to the 1.4.x branch in revision 7738.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org