Re: Document -> Change Tracking?
Am Dienstag, 19. September 2006 16:22 schrieb Juergen Spitzmueller: > LyX has some version control facilities (it is described in Extended.lyx, 6.2. > The description refers to an rcs system, but I think people have also > successfully used subversion and cvs). Only cvs, not subversion, but somebody sent an experimental patch for subversion support some time ago. Georg
Re: Document -> Change Tracking?
Wolfgang Keller wrote: > >> Especially merging? > > > > What exactly? > > I have a dream: ;-) > > A large document, editied by several authors in parallel (this is the usual > situation for large documents in companies). The document is stored in a > version control system (Subversion preferred), each user works on his own > working copy and checks in and updates regularly. > > The "central" author, who keeps track of the entire version/branch history, > regularly compares the version edited by each author with the main trunk, > reviews the changes and accepts/rejects them as he likes. > > All this in parallel, i.e. the individual authors don't turn their thumbs > while the "project boss" is reviewing the changes. Everyone is working > independently from each other. > > So a feature for comparing two instances of a document and then display the > changes using the change tracking feature would be required to make this > work... LyX has some version control facilities (it is described in Extended.lyx, 6.2. The description refers to an rcs system, but I think people have also successfully used subversion and cvs). What is not supported, is showing the differences via change tracking markup. This is planned, but I think no one has volunteered to implement it so far). > > Merging two documents into one (i.e. "Comparing" documents) is > > not yet supported. > > Is it on the roadmap? I think it is on someone's roadmap. > This would really have the potential to be a "killer" feature, as I know of > no document processing application that does this currently. Agreed. > > Merging (accepting and rejecting) changes can be done via > > Document->Change Tracking->Merge Changes > > Yes, but the way this works assumes that the editing->reviewing->editing > process is purely sequentially and there's never more than one person at a > time who's working on the document. Yes. It wasn't obvious to me that you are interested in version control. Jürgen > Sincerely, > > Wolfgang Keller
Re: Document -> Change Tracking?
Jean-Marc Lasgouttes wrote: >> "Wolfgang" == Wolfgang Keller >> <[EMAIL PROTECTED]> writes: > > Wolfgang> BTW: Is the LyX file format subversion-friendly (i.e. > Wolfgang> diff-able)? > > It is diff-able (just look at it, it is plain text), but we do not > have the tools to display the diffs in the interface. > > JMarc You might want to use kdiff3
Re: Document -> Change Tracking?
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
Re: Document -> Change Tracking?
Wolfgang Keller wrote: > is there some documentation available about how the "Change Tracking" > features in LyX work? AFAIK, there is no "official" documentation (i.e. in the LyX docs) yet, unfortunately. On the wiki, there's an (outdated, but maybe still helpful) page for a preliminary version of the feature: http://wiki.lyx.org/Tips/ChangeTrackingLyx1-3-2 If there are still questions, please ask on this list. > Especially merging? What exactly? Merging two documents into one (i.e. "Comparing" documents) is not yet supported. But there is a script available, which aims to do so (I didn't test it): http://www.cs.bgu.ac.il/~dekelts/ldiff/ Merging (accepting and rejecting) changes can be done via Document->Change Tracking->Merge Changes HTH, Jürgen
Re: Document -> Change Tracking?
> "Wolfgang" == Wolfgang Keller <[EMAIL PROTECTED]> writes: Wolfgang> BTW: Is the LyX file format subversion-friendly (i.e. Wolfgang> diff-able)? It is diff-able (just look at it, it is plain text), but we do not have the tools to display the diffs in the interface. JMarc
Document -> Change Tracking?
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)? TIA, Sincerely, Wolfgang Keller -- My email-address is correct. Do NOT remove ".nospam" to reply.
