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

RE: Diffing XML files or storing binary documents

From: Vincent Thornley <vthornley_at_iee.org>
Date: 2004-07-15 09:51:56 CEST

Felix Collins wrote:
> I think a locking scheme (exclusive checkout) would be better for OOo
> docs than the normal SVN functionality. Although having said this, it
> would be possible to take the OOo source and add support to SVN for
> intelligent merging and conflict resolution. Anyone feel up to the
> challenge? This would give subversion a major advantage over any other
> revision control package out there. Even MS Source Safe doesn't have
> support for MS Word docs (well not last time I checked).
>

Perhaps a more generally applicable solution would be for subversion to
recognise archive files (by content not extension to include .sx*) and delve
into them when performing merges, diffs, etc. Then the command can be
applied individually to each component of the archive file.

Vince

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jul 15 09:53:07 2004

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