From 43939fbb65dba8d2fcb1b998e44030a3fa7a2fc0 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Mon, 24 May 2010 22:07:30 +0000 Subject: [PATCH] Comment also to the trunk git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34495 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/doc/Additional.lyx | 88 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 1 deletion(-) diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx index 19ada7c04a..7e719dbf2d 100644 --- a/lib/doc/Additional.lyx +++ b/lib/doc/Additional.lyx @@ -20089,7 +20089,7 @@ svn --version Choose ssh client for Windows. There are more possibilities, we will use the one from Putty tools \begin_inset Foot -status collapsed +status open \begin_layout Plain Layout \begin_inset Flex URL @@ -20257,6 +20257,92 @@ svn co svn+ssh://user@server/repository_path . \end_layout +\begin_layout Subsubsection + +\change_inserted 1 1274738367 +End-of-Line Conversions +\end_layout + +\begin_layout Standard + +\change_inserted 1 1274738433 +When the collsraborators are mixing Linux and Windows environments, LyX + will use different line endings inside the .lyx files. + This is not problem as far as LyX functionality is concerned, but the commit + diffs will be huge and merge-conflicts prone. + Fortunately SVN itself knows +\begin_inset Foot +status collapsed + +\begin_layout Plain Layout + +\change_inserted 1 1274738731 +\begin_inset Flex URL +status collapsed + +\begin_layout Plain Layout + +\change_inserted 1 1274738731 + +http://svnbook.red-bean.com/en/1.4/svn.advanced.props.file-portability.html +\change_unchanged + +\end_layout + +\end_inset + + +\change_unchanged + +\end_layout + +\end_inset + + how to deal with CR/LF problems when switching .lyx files to the +\begin_inset Flex CharStyle:Code +status collapsed + +\begin_layout Plain Layout + +\change_inserted 1 1274738399 +native +\change_unchanged + +\end_layout + +\end_inset + + mode. +\begin_inset Foot +status collapsed + +\begin_layout Plain Layout + +\change_inserted 1 1274738457 +For the lazy guys: +\begin_inset Flex CharStyle:Code +status collapsed + +\begin_layout Plain Layout + +\change_inserted 1 1274738457 +svn propset svn:eol-style native FILE_NAME +\change_unchanged + +\end_layout + +\end_inset + + +\change_unchanged + +\end_layout + +\end_inset + + +\end_layout + \begin_layout Subsection Further tuning \end_layout -- 2.39.2