Am Donnerstag, 18. Mai 2006 23:54 schrieb Rainer Dorsch: > Hello, > > we are working on a large LyX document and use CVS as a version control > system. One of the authors uses LyX on windows. His LyX files contain an > additional ^M on each line break. This is fine as long as nobody needs to > merge a document with changes from the Lyx on Win author. Before he used a > cygwin LyX version, which did not have this issue. > > Has anybody solved this problem before?
Yes, but with svn. I don' know if it is possible with cvs. With svn you can either set up a post-commit script on the svn server that changes the line endings before checkin, or you can set the eol-style of the files to native. The latter works only if the windows user checks out the doc under windows. Georg
