Darren Freeman ha scritto:
If you haven't used it, give "kompare" a go. For regular text files, it's fantastic!
Actually, my preferred CVS manager is the one within Eclipse (even for articles) :-)
Although this isn't the nicest solution, it gets you partway there. If you can read raw LyX you can see your changes in a reasonable manner.
I'm not only thinking at seeing the differences -- this is done almost well for regular text with "cvs diff" or whatever other tool, even if looking at differences within formulas would be greatly improved through a LyX WorkArea widget. I'm also thinking at *merging* differences in case of conflict. The problem is that, if you do that by hand with a text-based cvs management tool, you are at risk of corrupting your LyX files (e.g. missing begin or end of some insets), unless of course you know quite well the ".lyx" file syntax.
Now, think at all of this in a future in which LyX might embrace XML-based representation of documents (I've read smth. like that on the list). The simple text-based diffing tools would produce an output that is harder and harder to read, wouldn't they ? Last, think at what happens if you enable compression of .lyx files (it is already possible within LyX, isn't it ?). T.
