[prev in list] [next in list] [prev in thread] [next in thread] 

List:       tortoisesvn-dev
Subject:    Re: [TMerge] Show Whitespace behaviour
From:       Stefan_Küng <tortoisesvn () gmail ! com>
Date:       2009-10-27 19:29:02
Message-ID: 4AE749FE.6060301 () gmail ! com
[Download RAW message or body]

On 27.10.2009 09:46, Olaf van der Spek wrote:
> On Mon, Oct 26, 2009 at 7:48 PM, Stefan Küng<tortoisesvn@gmail.com>  wrote:
>> On 21.10.2009 10:05, Olaf van der Spek wrote:
>>> Hi,
>>>
>>> When ignore all whitespaces is set, TMerge hows the old line instead
>>> of the new line. I think it should show the new line.
>>
>> It shows the new line for me?
>> What version are you using?
>
> 1.6.5
>
>> Do you have two example files to reproduce the issue?
>
> a: int  f()
> b: int f()
>
>> What other settings do you have done in TMerge?
>
> I use the single pane view.

That was the clue :)
Fixed in r17592.

>>> Also, when the only changes in a file are whitespace, maybe it should
>>> default to show those differences.
>>
>> It shows a white dot on the left of such lines, even if all whitespaces
>> are ignored. Does it not for you?
>
> Not in the single pane view.

True. Unfortunately, that might take longer to fix.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2411779

To unsubscribe from this discussion, e-mail: [dev-unsubscribe@tortoisesvn.tigris.org].

[prev in list] [next in list] [prev in thread] [next in thread]