Re: Merging lyx documents (can version tracking be abbused for this)
On Thu, 07 Jun 2007 18:58:33 -0500 Todd Denniston <[EMAIL PROTECTED]> wrote: > Micha Feigin wrote: > > On Wed, 06 Jun 2007 11:06:44 +0200 > > Helge Hafting <[EMAIL PROTECTED]> wrote: > > > >> [EMAIL PROTECTED] wrote: > [...] > > [...] > >> 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. > > > > You might be able to solve your problems by changing your procedures a little. > You are working on a document in parallel... > Answer the following questions: > 1) Can the document be broken up in to chapters/sections? > 2) Are the two of you _normally_ working on the same chapter/section? > 3) Are you adverse to having a master document that pulls in sub-documents? > 4) Are you on windows or Unix? (determines some of the other tools that would > be suggested.) > > > if (1) is yes, then if you can create the outline of the document this will > put physical "space" in the document between your changes, this makes using > things like patch, rcs and CVS easier. > I always break up the document into chapters/sections (that is usually the starting point) > if (2) is yes, then likely the current tools can't help. if (2) is no then > tools like patch, rcs and CVS can make your lives a little easier, with > communication and practice. > At the point where collaboration starts it is very usual that we work on the same parts of the document at the same time. The problem is that lyx breaks up the lines differently after you edit them its very hard to compare the files. Another problem is that things like references take up a very large space so that it's hard to figure out where they go and what they say. I need some tool that can work on the lyx file visually (inside lyx) instead of as a text file. > if (3) is no, using the tools already mentioned becomes a lot easier. > Depending on the size. When its a 8-12 page long article it becomes very impractical. > if (4) is Unix, you probably already have the tools you need. if (4) is > windows, we (the group) can probably guide you in finding _some_ of the tools > to make things work better [CVSNT]. > I work in linux. Others use windows but I do the merge so its no problem. Under linux I use meld at the moment to compare the files, but like I said, if it's not just simple text (changes often include changes to equations and references) than it's very difficult to compare with such a tool For windows there is winmerge which is free and relatively nice. > Folks in the group have tackled multiple people working on the same document > a few times already. > > Or did I misread your desire here? For an initial solution, what would do a rather good job is to be able to enable change tracking, then replace the old document with the new one but instead of seeing the whole document as changed, to just see those parts that really changed. With the current implementation, if you delete a word and retype it exactly as it was, it will be marked as deleted and inserted instead of being returned to that state of unchanged which would be much more useful (if that was the case I could just delete the old document and insert the new one).
Re: Merging lyx documents (can version tracking be abbused for this)
Micha Feigin wrote: On Wed, 06 Jun 2007 11:06:44 +0200 Helge Hafting <[EMAIL PROTECTED]> wrote: [EMAIL PROTECTED] wrote: [...] [...] 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. You might be able to solve your problems by changing your procedures a little. You are working on a document in parallel... Answer the following questions: 1) Can the document be broken up in to chapters/sections? 2) Are the two of you _normally_ working on the same chapter/section? 3) Are you adverse to having a master document that pulls in sub-documents? 4) Are you on windows or Unix? (determines some of the other tools that would be suggested.) if (1) is yes, then if you can create the outline of the document this will put physical "space" in the document between your changes, this makes using things like patch, rcs and CVS easier. if (2) is yes, then likely the current tools can't help. if (2) is no then tools like patch, rcs and CVS can make your lives a little easier, with communication and practice. if (3) is no, using the tools already mentioned becomes a lot easier. if (4) is Unix, you probably already have the tools you need. if (4) is windows, we (the group) can probably guide you in finding _some_ of the tools to make things work better [CVSNT]. Folks in the group have tackled multiple people working on the same document a few times already. Or did I misread your desire here? -- Todd Denniston Crane Division, Naval Surface Warfare Center (NSWC Crane) Harnessing the Power of Technology for the Warfighter
Re: Merging lyx documents (can version tracking be abbused for this)
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 >
Re: Merging lyx documents (can version tracking be abbused for this)
[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. It merely shows what were added or deleted and by who. Which can be useful as it is - it is much easier to find the (few) changes made in a big text in order to review them. I don't think the change tracking can reduce the amount of work in such a merging. It may be helpful used like this though: * Import the changed latex file into a new lyx document. * Turn change tracking on in the old document you have edited. * copy+paste the entire new document into the old one. Perhaps one big copy, or perhaps section by section so that each seaction appear twice - new and old. You now have a document where everything is listed twice, except where there are differences. And all the stuff done by the other author is marked as "inserted" with LyX changetracking. You can now work to eliminate all the marked stuff in order to do the merge: * Where no difference exist - just delete the extra paragraph - obvious. * Where difference exist, either: - delete the new - delete your stuff, accept the new section so it is no longer marked as changed. - rewrite/manual merge sentence by sentence. Accept all your own changes immediately, of course. This won't save any editing work over not using changetracking. What it will do, is to give you an easy way to find remaining work, as you can always just go to the "next change" using the changetracking toolbar/menu. This way, there will be no forgotten double pieces in the middle - you will never have to search for unfinished work. 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. Helge Hafting
Merging lyx documents (can version tracking be abbused for this)
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?) Thanks This message was sent using IMP, the Internet Messaging Program.
