Major Description
I imported a script converting between unix and dos eol styles into a
subversion repository. The script has LF line endings but contains
some CR characters.
Not knowing this, I set the svn:eol-style property to native and did a
commit with follwing result:
oertel@mhpa2vrc:~/svntest> svn co
file://localhost/home/oertel/svntest/repo/proj
A proj/unixprep.sh
A proj/Readme.txt
Checked out revision 4.
oertel@mhpa2vrc:~/svntest> cd proj
oertel@mhpa2vrc:~/svntest/proj> ls
Readme.txt unixprep.sh
oertel@mhpa2vrc:~/svntest/proj> svn ps svn:eol-style native Readme.txt
property `svn:eol-style' set on 'Readme.txt'
oertel@mhpa2vrc:~/svntest/proj> svn ps svn:eol-style native unixprep.sh
property `svn:eol-style' set on 'unixprep.sh'
oertel@mhpa2vrc:~/svntest/proj> svn status
_M Readme.txt
_M unixprep.sh
oertel@mhpa2vrc:~/svntest/proj> svn ci -m "Properties set"
Sending Readme.txt
Sending unixprep.sh
svn: A problem occured; see later errors for details
svn: Commit succeeded, but other errors follow:
svn: Problem running log
svn: Error bumping revisions post-commit (details follow):
svn: in directory /home/oertel/svntest/proj
svn: start_handler: error processing command 'committed' in
/home/oertel/svntest/proj
svn: error replacing text-base: unixprep.sh
svn: Inconsistent line ending style
svn: /home/oertel/svntest/proj/unixprep.sh
oertel@mhpa2vrc:~/svntest/proj> svn status
oertel@mhpa2vrc:~/svntest/proj> less unixprep.sh
===> file unixprep.sh is ok
oertel@mhpa2vrc:~/svntest/proj> svn update
_U unixprep.sh
Updated to revision 5.
oertel@mhpa2vrc:~/svntest/proj> less unixprep.sh
===> file unixprep.sh has its <cr> characters converted to <lf>
Perhaps it should be checked that the usage of cr/lf characters is
consistent at the time the property svn:eol-style is being set???
What kind of file is this script??? If it's text, setting the property
should have predictable results or shouldn't work at all. If it's
binary, it should have been marked as binary setting the svn:mime-type
property.
Regards,
Norbert
Original issue reported by oertel_n