Oliver Goodman wrote: > Hi, > > Another person here who would like to be able to use OpenOffice with > version control tools like subversion (without requiring strict file > locking as we do at present). I thought it would not be a big deal to > do the following: > > Write python script to unzip .odt file and pretty-print the xml > components (so that they are multi-line and suitable for feeding to > "diff" and the like). Store all odt documents as directories rather > than individual files. To edit, re-zip (and de-prettify), edit and then > unzip again. Then store the directory tree rather than the zipped .odt > file in our version control system. Most of this can be automated.
You know that you can enable "pretty printing" in the OOo options? It would also be possible to store files into a folder (instead of a package file) directly from OOo using its API though it would need some development work. > Unfortunately the effect of making a one word change to the text of a > document is to change the content.xml component in many different > places (some cross-referencing tags by the look of it). Small changes > made independently to two copies of a document immediately cause > conflicts when one attempts to merge them.. widespread conflicts which > would be an utter waste of time to attempt to fix by hand. Hm, I doubt that this statement is true in general. Can you give an example for merge conflicts caused by simple changes? > > I've noted some discussion in other threads about FlatXMLFilter. Does > that have a different approach to serializing the content which would > not suffer from this kind of problem? No, it just puts all XML streams into one. Ciao, Mathias -- Mathias Bauer (mba) - Project Lead OpenOffice.org Writer OpenOffice.org Engineering at Sun: http://blogs.sun.com/GullFOSS Please don't reply to "[EMAIL PROTECTED]". I use it for the OOo lists and only rarely read other mails sent to it. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
