Proper diffs with ODF files in Git or Mercurial

Re:Proper diffs with ODF files in Git or Mercurial by imurray on Sunday October 30, 2011 @03:36PM (#3175226)

I'm not sure if odt2txt puts paragraphs on one line, or flows them. But either way, if you change a single word in a long paragraph you can get large-looking diffs. For version-controlled documents it's good to use a word-based diff rather than a line-based diff.

I use wdiff (although it's slightly kludgy) with documents and colorize the output: http://homepages.inf.ed.ac.uk/imurray2/compnotes/cwdiff/

[ Parent | on HN ]

Re:Proper diffs with ODF files in Git or Mercurial by fr0sty on Sunday October 30, 2011 @05:41PM (#3175504)

'git diff' already supports --word-diff natively.

[ Parent | on HN ]

Re:Proper diffs with ODF files in Git or Mercurial by imurray on Sunday October 30, 2011 @06:15PM (#3175571)

Great! Thanks. I now see that git also has a built-in --color-words option, and I've added that to my notes. (I don't have a git setup to quickly try whether that would still work in conjunction with an external diff tool like oodiff though.)

In the mean time I'm using my (trivial) cwdiff wrapper in place of diff in tools that don't have a built-in option. I think it could be called from the oodiff utility here, where it would work equally well with any versioning system.

[ Parent | on HN ]

Re:Proper diffs with ODF files in Git or Mercurial by bergie on Sunday October 30, 2011 @03:41PM (#3175239)

It seems to flow them. At least that is what I see with git log -p.

The benefit with this approach is that it works with exactly the same commands that I use for source control.

[ Parent | on HN ]

Re:Proper diffs with ODF files in Git or Mercurial by loveatlonglast on Sunday October 30, 2011 @06:03PM (#3175549)

I'm thinking of building a productivity tool in the legal space. The big inspiration I had a week ago is that I could use git or another version control system for features like git-diff and git-blame.

I'm now thinking about how most elegantly add markup features for things like highlighting text, adding labels, inline commenting, muti-media embeds, and text formatting both simple and complex. any suggestions? The naive thing to do is to include a <span> based markup format that complements what is already being done with font-size,color etc but im worried that it will become a mess. Both in terms of document size and git diff.

also, are there any examples of products that successfully leveraged version control systems to create large project management tools?

[ Parent | on HN ]