Error: MERGE request failed on '/wowace/trunk'
Error: 'pre-commit' hook failed with error output:
Error: /var/repos/pre-commit.d/check-mime-type:
Error: trunk/GridDynamicLayout/GridDynamicLayout.lua : svn:eol-style is not set
Error: trunk/GridDynamicLayout/GridDynamicLayout.toc : svn:eol-style is not set
Error: Every added text file must have the svn:eol-style property set.
Error: We also -advise- that svn:mime-type be
Error: set, but it is not a
Error: requirement for text files.
Error: See http://www.wowace.com/wiki/SVN_Rules and
Error: http://www.wowace.com/wiki/SVN_AutoProps for details and
Error: instructions on how to set the properties in Linux and in
Error: Windows with both TortoiseSVN
Error: and the command-line client.
It gives me the following error :
I have the TortoiseSVN settings done as said in http://www.wowace.com/wiki/SVN_AutoProps.
What am I doing wrong ?