On Tuesday 19 September 2006 02:05, Wolfgang Keller wrote: > Hello, > > is there some documentation available about how the "Change Tracking" > features in LyX work? Especially merging? > > BTW: Is the LyX file format subversion-friendly (i.e. diff-able)?
I use LyX with SVN regularly. According to my experience, collaborative writing when the authors are working in their own parts is flawless and I am happily using it. However, things get complicated when: 1) you run into a conflict, merging the files using standard tools may produce invalid LyX file. This is due to the fact that LyX file contains, e.g. \begin_inset ERT status Collapsed \layout Standard \backslash \end_inset This confuse all merging tools I tried, since they are line-based and they are not able to respect the corresponding \begin_inset and \end_inset. If they (or you manually) accidently remove the beginning or end, you are in trouble. If anyone known of a merging tool that is able to treat \begin_inset \end_inset correctly, please let me know. 2) using LyX Change-Tracking feature. The trouble is that LyX is changing ID numbers of each change when saving. Therefore, any two saved documents have differences on the same line, causing conflicts. You have to go through your files manually to correct this. Vasek -- ----------------------------------------------------------------------------- Ing. Vaclav Smidl, Ph.D. tel: +420 26605 2420 AS department, Institute web: http://staff.utia.cz/smidl/ of Information Theory and Automation, fax: +420 26605 2068 Prague, Czech Republic
