[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: Ryan Schmidt <subversion-2008b_at_ryandesign.com>
Date: Wed, 14 May 2008 01:29:25 -0500

On May 14, 2008, at 12:25 AM, Dylf wrote:

>> Dennis Schwartz-Knap wrote:
>>> Can the subversion server handle merge commands for docx format??
>> Try TortoiseSVN:
>> http://tortoisesvn.tigris.org/
>> TortoiseMerge supports docx via diff-scripts (they come with
>> TortoiseSVN):
>> http://tortoisesvn.tigris.org/source/browse/tortoisesvn/trunk/
>> contrib/other/
>> diff-scripts/
> Hmm... should my question then be: Can Subversion or Tortoise
> handle merges
> of pure xml files?? Is xml considered as a binary fileformat??

Subversion will treat XML files as text files (if you give it a "text/
*" MIME type) or as binary files (i.e. will do no merging, if you
give it an "application/*" MIME type).

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-14 08:29:50 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.