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

Re: TMerge highlights line-end changes on empty lines

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-09-08 09:06:29 CEST

Simon Large wrote:
> On 07/09/07, Stefan Küng <tortoisesvn@gmail.com> wrote:
>> Simon Large wrote:
>>> On 07/09/07, Stefan Küng <tortoisesvn@gmail.com> wrote:
>>>> Simon Large wrote:
>>>>> Hi folks,
>>>>>
>>>>> When diffing a file with 'ignore line endings' set, any empty lines
>>>>> are not ignored. To see this, take any versioned file which contains
>>>>> blank lines, and change its line endings. TSVN->diff shows all the
>>>>> empty lines as changed and all the lines with content as unchanged.
>>>> Reported on the svn mailing list. 'svn diff -x--ignore-eol-style' does
>>>> the same (if svn:eol-style property is not set, otherwise it will
>>>> normalize all eols first before doing the diff).
>>> Just tried on a file with svn:eol-style=LF and it does the same.
>> You used an svn.exe built from the Subversion trunk? Because the 1.4.x
>> version doesn't have the -x--ignore-eol-style flags.
>
> I mean I just tried using TSVN 1.4.99.10478

Yes, because TSVN diffs the files without normalizing the eol-style first.
I was talking about how to reproduce the problem with the CL client
(which is important to get the Subversion people to have a look at it).

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
Received on Sat Sep 8 09:03:20 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.