You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Dennis Schwartz-Knap <de...@gmail.com> on 2008/05/13 07:39:12 UTC
svn and docx
Hi all
Can the subversion server handle merge commands for docx format??
\dennis
Re: svn and docx
Posted by Andy Levy <an...@gmail.com>.
On Wed, May 14, 2008 at 6:45 PM, Jared Silva <ja...@gmail.com> wrote:
> Dennis Schwartz-Knap wrote:
>> Thanks allot, this clears the problem somehow. Hope that I can find a merge
>> tool for Tortoise.
>
> TortoiseMerge comes with TortoiseSVN!
But when it comes to docx files, TSVN should invoke a VBScript
(provided with TSVN) which in turn invokes Word in "document
comparison" mode which uses the change-tracking features to show the
differences.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svn and docx
Posted by Jared Silva <ja...@gmail.com>.
Dennis Schwartz-Knap wrote:
> Thanks allot, this clears the problem somehow. Hope that I can find a merge
> tool for Tortoise.
TortoiseMerge comes with TortoiseSVN!
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
RE: svn and docx
Posted by Dennis Schwartz-Knap <dk...@c.dk>.
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@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@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
--
----------------------
Mark S. Reibert, Ph.D.
svn@reibert.com
----------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svn and docx
Posted by Mark Reibert <sv...@reibert.com>.
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@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
--
----------------------
Mark S. Reibert, Ph.D.
svn@reibert.com
----------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svn and docx
Posted by Ryan Schmidt <su...@ryandesign.com>.
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@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
RE: svn and docx
Posted by Dylf <dy...@direkte.org>.
Hmm... should my question then be: Can Subversion or Tortoise handle merges
of pure xml files?? Is xml considered as a binary fileformat??
BR.
\dennis
-----Original Message-----
From: Jared Silva [mailto:jayrod@gmail.com]
Sent: 14. maj 2008 00:08
To: users
Subject: Re: svn and docx
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/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svn and docx
Posted by Jared Silva <ja...@gmail.com>.
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/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svn and docx
Posted by Karl Fogel <kf...@red-bean.com>.
"Andy Levy" <an...@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@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svn and docx
Posted by Andy Levy <an...@gmail.com>.
On Tue, May 13, 2008 at 3:39 AM, Dennis Schwartz-Knap <de...@gmail.com> wrote:
> 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org