RE: svn and docx

Thanks allot, this clears the problem somehow. Hope that I can find a merge
tool for Tortoise.

BR.
\dennis

-----Original Message-----
From: Mark Reibert [mailto:svn_at_reibert.com]
Sent: 14. maj 2008 08:47
To: Ryan Schmidt
Cc: Dylf; 'users'
Subject: Re: svn and docx

Keep in mind that like the OpenDocument format used by OOo, Office Open
XML packages the collection of files that comprise the document in a ZIP
file. Hence your ".docx" file will not be text-based (i.e., line
oriented).

The MIME type for ".docx" is something like:

application/vnd.openxmlformats-officedocument.wordprocessingml.document

If you set the svn:mime-type property accordingly, SVN will (correctly)
not attempt to textually merge these files.

On Wed, 2008-05-14 at 01:29 -0500, Ryan Schmidt wrote:
> 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
>

-- 
----------------------
Mark S. Reibert, Ph.D.
svn_at_reibert.com
----------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org