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.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest interface to (Sub)version control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3064288
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-10 22:08:08 CEST