On 05/24/2010 04:31 PM, Rainer Dorsch wrote:
Hello,
I am working on a multi-author technical document. We decided to test LyX for
that, among other reasons because of its cross platform availability and
human readable document source code which can be maintained in SVN and many
team co-authors are familiar with LaTeX anyways.
A few days back we found that LyX on Linux separates lines in a LyX file with
LF whereas LyX on Windows separates lines with CRLF. This gives then a huge
diff in an SVN commit (every line in a file) and increases the chance for
merge conflicts.
Do you have suggestions how to deal with that difference between the Linux and
Windows LyX version? Can the behavior of either one be changed?
I believe you can fix this in svn itself. LyX uses "native" line
endings, and svn can be set to ignore these differences. See e.g.:
http://magic.aladdin.cs.cmu.edu/2006/03/01/end-of-line-conversion-in-subversion/
http://svnbook.red-bean.com/en/1.4/svn.advanced.props.file-portability.html
rh
