Re:Proper diffs with ODF files in Git or Mercurial
by Karellen on Sunday October 30, 2011 @06:59PM
(#3175655)
Pretty cool.
Would would be even better would be if:
a) Git diff/merge gets ability to look into zip/archive files, treating them as sub-trees of files. diff should be not too tricky. Merge is more awkward, because you have to create a new zip/archive which is compatible with the format of the parents.
b) Git diff/merge gets ability to work well on XML files, and be XML-element-based, not line-based.
With those, full version control with branching and merging of ODF files, plus many other interesting file types, falls out almost "naturally".
Would would be even better would be if:
a) Git diff/merge gets ability to look into zip/archive files, treating them as sub-trees of files. diff should be not too tricky. Merge is more awkward, because you have to create a new zip/archive which is compatible with the format of the parents.
b) Git diff/merge gets ability to work well on XML files, and be XML-element-based, not line-based.
With those, full version control with branching and merging of ODF files, plus many other interesting file types, falls out almost "naturally".