[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: Felix Collins <felix_at_keyghost.com>
Date: 2004-07-11 23:22:20 CEST

Roger Keays wrote:

> Hi Felix,
> OOo documents under svn sound very interesting!

> Do you do merges often? How often do you get conflicts and is svn an
> effective way to allow a document to be edited by different users in
> parallel?

Any merge will result in a conflict because SVN only does text merges.
We don't have too many files that are worked on by multiple people yet.
  I have had to do three conflict resolution/merge operations so far.
It is quite easy using the Compare Documents command in OOo. (at least
in OO writer).

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).

> Also, where can you get the FlatXMLFilter ? My debian distribution doesn't
> seem to include it.

Don't know.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jul 11 23:22:41 2004

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.