On Wed, 06 Jun 2007 11:06:44 +0200 Helge Hafting <[EMAIL PROTECTED]> wrote:
> [EMAIL PROTECTED] wrote: > > I have an imported tex->lyx document that I changed and now the original > > (tex) was also changed by the original author > > What is the best (or easiest) way to merge these changes? > > AFAIK gui diff programs are sensitive to line breaks and will probably get > > things wrong. Is it possible to abbuse the lyx change tracking mechanism > > somehow to do this? (can it be used to merge changes done on a different > > copy of the document instead of just on the current one?) > > > The change tracking does not really help you with the editing operations. > [...] > > To really save work here, learn to use the changetracking feature. > Then show your coworker LyX, perhaps he'll be impressed enough > to use it - you can then pass LyX documents back and forth > using changetracking. LyX will not prevent him from using LaTeX, > he may still apply all tricks he knows using ERT. > I can probably push lyx on her. The two problems are that we do a lot of work for journals and conferences and most of them use all kinds of wierd document styles which can make things a little auckward occationally. The actual issue here won't be solved though by the default change tracking implementation. What I need is a way to work in parrallel on the same version and then merge the changes. I see two proposed enhancements here at the moment. 1. Allow the change tracking system produce a three way merge (not sure how difficult) 2. Allow using an existing lyx layout with just changing the latex style file. It will be nice if someone else is interested enough, otherwise, I'm hoping to have some time in about 3-4 months to start amusing myself with this. > Helge Hafting >
