subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Thorsten Schöning <>
Subject Re: svn:eol-style native and reintegrate merge
Date Fri, 05 Oct 2012 10:37:56 GMT
Guten Tag James French,
am Freitag, 5. Oktober 2012 um 12:17 schrieben Sie:

> Inline quotes are simple...

> A working copy diff is when I diff my working copy against the
> repo. I did not expect to see all my files changed to unix line
> endings on my disk, and indeed this didn't happen when I did the
> same operation with svn 1.6.

I think I get confused, you jump between 1.6 and 1.7 to often: You did
a reintegrate merge with 1.6 and all files in the repo got changed, a
local diff is telling you that, but your line endings in the working
copy are still CR/LF, right? If you do the same with 1.7, all line
endings of the files merged in the repo change to LF as well, but the
ones in your working copy are changed to LF and not stay or changed to
CR/LF, too? The latter case is something I wouldn't have expected,

> To complicate matters further I'm doing
> some further testing in a sandbox environment with 1.7 and now its
> not converting to unix when I reintegrate (as I would expect)!

What did you merge where? May the files in the repo already were
converted before?

> Where is this documentation?

I already quoted in my first answer:

> Note that Subversion will actually store the file in the repository
> using normalized LF EOL markers regardless of the operating system.
> This is basically transparent to the user, though.

> I don't believe that I'm afraid. The
> whole point of native eol is to get, ugh, native eol on your platform! your working copy, not in the repo. It's fully understandable if
Subversion normalizes line endings on files if you want it to convert
between different line endings automatically. Normalized files only
need to be converted from LF to anything, not anything to anything.

Mit freundlichen Grüßen,

Thorsten Schöning

Thorsten Schöning
AM-SoFT IT-Systeme

Telefon.............030-2 1001-310
Fax...............05151-  9468- 88
Mobil..............0178-8 9468- 04

AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln
AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow

View raw message