svn checkout failes to add corret EOL on windows machine

+Yan · 03-17-2009, 04:41 PM

Hello,
We are using svn client version 1.5.6. I was able to setup svn server on linux server successfully. The server is working fine for linux machies. I.e. if they checkout/checkin source code, the line endings are unix style. The problem comes when the source is checkouted on Windows machine. SVN client does not automatically add 0xd at the end of line. Instead of that the line ending is unix style - 0xa . I tried to change config file in this way:

[miscellany]
enable-auto-props = yes

[auto-props]
*.PL = svn:eol-style=native
*.pl = svn:eol-style=native
*.cpp = svn:eol-style=native
*.c = svn:eol-style=native
*.h = svn:eol-style=native
*.dsp = svn:eol-style=native
*.dsw = svn:eol-style=native
*.sh = svn:eol-style=native;svn:executable
*.SH = svn:eol-style=native;svn:executable
*.txt = svn:eol-style=native
*.png = svn:mime-type=image/png
*.jpg = svn:mime-type=image/jpeg
Makefile = svn:eol-style=native

But it looks like this is used when I commit or import files onlyn
When I checkout source files (.c for example) they have incorrect EOL.

Searching the net I found another approach:
svn propset -R svn:eol-style native .
This command is valid only if:
1. I checkout the sources.
2. change to work directory.
3. execute the command.
4. delete checkout-ed files without deleting .svn directories or their content.
5. execute svn update. In this case EOL's are ok.

My question is quite simple.
Is there any easy way to tell svn client to add correct EOL symbols when I'm checkouting source, and restoring the EOL to original one when I'm committing the source ?
I know that there are external programs that can do the conversion, but I would like to avoid this.

--
Thank you in advance for your answers.

paulsm4 · 03-19-2009, 01:31 AM

Hi -

You basically have the correct solution to the problem:

http://svnbook.red-bean.com/en/1.1/ch07s02.html

Quote:

native

This causes the file to contain the EOL markers that are native to the operating system on which Subversion was run. In other words, if a user on a Windows machine checks out a working copy that contains a file with an svn:eol-style property set to native, that file will contain CRLF EOL markers. A Unix user checking out a working copy which contains the same file will see LF EOL markers in his copy of the file.

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.

However, perhaps you should do this:

http://svn.haxx.se/tsvn/archive-2008-11/0035.shtml

Quote:

a) set svn:eol-style=lf on each of the text files in your repository
b) set svn:eol-style=native on all clients that check-out/update these files

You might also consider setting MIME type and EOF settings in the same configuration file, and making sure all your clients can share a standard SVN configuration file. Here are a couple of examples:

http://www.topazproject.org/trac/wiki/SubversionSetup
http://www.ogre3d.org/wiki/index.php...rsion_settings

'Hope that helps .. PSM

PS:
I also just stumbled across this gem:

http://svn.haxx.se/users/archive-2008-09/0858.shtml

Quote:

Have you looked at svn:eol-style=share?

That keeps the line endings in the repository as Unix LF, but changes
them in your working copy depending upon the platform you use. On
Unix, they'll be LF, on Windows, they'll be CRLF.