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

Re: svn and docx

From: Karl Fogel <kfogel_at_red-bean.com>
Date: Tue, 13 May 2008 16:15:45 -0400

"Andy Levy" <andy.levy_at_gmail.com> writes:
>> Can the subversion server handle merge commands for docx format??
>
> In what way? Subversion should do binary diffing on these files the
> same as any other file format.

I don't think he's talking about repository storage; he's talking about
merging contents during 'update' and 'merge'. Dennis, I don't know
anything about docx format. If it's a line-based text format, you're
probably okay; if it's something else, you're probably not okay. Can
you point us to a URL about it?

Is it http://en.wikipedia.org/wiki/Docx? If so, Subversion doesn't know
how to merge it, but you could configure Subversion to invoke an
external merge tool to handle those merges, as you could with any format
for which such a tool exists.

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-05-13 22:16:12 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.