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

Re: newline symbol is always the same (TortoiseMerge)

From: Simon Large <simon.tortoisesvn_at_gmail.com>
Date: Wed, 11 Sep 2013 23:20:31 +0100

On 11 September 2013 11:19, Simon Large <simon.tortoisesvn_at_gmail.com> wrote:
> On 10 September 2013 21:07, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
>> On 10.09.2013 14:43, Simon Large wrote:
>>> On 10 September 2013 12:53, Dan Lasley <dlasley_at_milleredge.com> wrote:
>>>> I am seeing the same thing. I imported Windows CR/LF and checkout gives me LF. I thought there was a global setting to select the preference, but I can't seem to find it.
>>> TortoiseMerge -> Settings -> General -> Ignore line endings (recommended)
>>> The default is to ignore any differences in line endings.
>>> However I can confirm some strange behaviour with 1.8.1
>>> Start out with a normal windows-style file and edit in a hex editor to
>>> remove CR on one line. Now all lines have CRLF line endings except
>>> that one which has just LF. Save the file. Subversion does not detect
>>> the change (CLI is the same in this respect). This is strange given
>>> that the file size and timestamp have changed. However, my guess is
>>> that because this file has svn:eol-style set to native that if I were
>>> to commit any other change subversion would silently change the LF
>>> back to CRLF.
>> Actually, no: if you wanted to commit that, you would get an error
>> "inconsistent line endings" and the commit would abort.
>> But if you do an update, then the EOLs will be 'fixed' to native (or
>> whatever you've set with svn:eol-style).
>>> Now change a different line and save again.
>>> TSVN and SVN show the file as changed, as expected and I can now diff
>>> with TMerge.
>>> TMerge shows the line ending change provided that 'ignore line
>>> endings' is turned off, but the character used to represent the line
>>> ending is the same in both files, i.e. the bent arrow, so it is not
>>> possible to see why the line is marked as changed without using a hex
>>> editor.
>> That's very, very strange. Whenever I try this, I can see the different
>> EOL markers in TMerge.
> In case it's relevant I'm seeing this on my XP machine at work. I'll
> try it on Win7 when I get home.

Same in Win7.

Two text files attached, plus a screenshot.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2013-09-12 00:20:38 CEST

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

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