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

Jarmo Torvinen wrote:
> Tested on: TortoiseSVN 1.4.0, Build 7501 - 32 Bit
> OS: Windows XP SP2
>
> Steps to reproduce:
> 1) Make a text file that looks like this and commit it to repository
> (test_file.c):
> // line 1
> // line 2
> // line 3
> // line 4
> // line 5
> // line 6
> // line 7
> // line 8
>
> 2) edit it in your local working copy to look like this (edit lines 2
> and 7):
> // line 1
> // line <tab>2
> // line 3
> // line 4
> // line 5
> // line 6
> // line 7 has now more text
> // line 8
>
> 3) Right click on file in WC and selectTortoiseSVN > Diff
> 4) You can see that lines 2 and 7 were edited
> 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

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