[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: improving subversion treatment of compressed XML/text file formats

From: David Kaplan <David.Kaplan_at_ird.fr>
Date: Fri, 24 Oct 2008 19:04:32 +0200


On Fri, 2008-10-24 at 18:28 +0200, Benjamin Smith-Mannschott wrote:
> SVN Repo Space Efficiency when Edited often:
> format space efficiency merge-friendlyness
> ============= ================ ==================
> plain text very good very good
> html very good good
> flat ODT: good poor [1]
> msword doc acceptable impossible [2]
> msword docx poor impossible [2]
> ODT poor impossible [2]
> ---------------------------------------------------
> [1] This format isn't widely supported (a pitty, really).
> [2] SVN will not and should not attempt to merge these
> formats as they are not textual. Microsoft-word and
> OpenOffice do contain features allowing a user to
> perform merges independently of svn within the tool,
> it's just that they'd have to do this "by hand" for
> every merge conflict.
> ===================================================
> // Ben

Just one question about merging with ODT-like documents: not being able
to merge would leave things no worse than binary docs, right? By this I
mean that SVN does not try to merge changes in binaries currently. So
one could still get advantages in space by doing some sort of
uncompress-diff process as I previously suggested, but one would just be
left without the possibility of merging. Is this correct?

Also, why is html better at merging than flat ODT? I would imagine that
any XML-like format would have problems with blind merging.

If anyone has thoughts on implementing this super-compressed text
diffing with appropriate hooks somehow, I would love to hear them. It
doesn't sound that difficult to do the uncompress, tar, diff process,
but doing it right is probably out of my league.

I also wonder if bazaar or some other cms has tried to tackle this



David M. Kaplan
Charge de Recherche 1
Institut de Recherche pour le Developpement
Centre de Recherche Halieutique Mediterraneenne et Tropicale
av. Jean Monnet
B.P. 171
34203 Sete cedex
Phone: +33 (0)4 99 57 32 27
Fax: +33 (0)4 99 57 32 95
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-10-24 23:37:25 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.