[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [TSVN] Request: TortoiseMerge, color settings

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-07-19 11:34:59 CEST

SteveKing wrote:
> On 7/19/05, Simon Large <simon@skirridsystems.co.uk> wrote:
>
>>SteveKing wrote:
>>
>>>On 7/19/05, Robert Schneider <r.schneider@weingartner.com> wrote:
>>>
>>>
>>>>When I go to the settings of TortoiseMerge I'm a little
>>>>confused with the second and third colour. 'Whitespace'
>>>>means also case changes, right? But what is 'Whitespace
>>>>diff'? When and where is this colour used?
>>>
>>>
>>>No. Whitespace *never* means case changes. A whitespace is an
>>>invisible char like tab, space, return.
>>>The 'Whitespace diff' color is used to mark changes only in
>>>whitespaces (which means in most programming languages no important
>>>change), e.g. line indenting corrections, changed spaces to tabs, ...
>>
>>But when are those colours used? If there is a change in a line, then it
>>gets shown as added/deleted. If you ignore whitespace in the compare,
>>the difference is not shown at all. Or are you looking at the line diff bar?
>
>
> If there's a change in a line only in whitespace (and ignore
> whitespace is turned off), then (in two pane view) the whitespace
> diffs are shown 'in line' with that color.

I don't see that here. See screenshots.

Simon

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



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

TMerge2.png TMerge1.png
Received on Tue Jul 19 11:34:25 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.