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

Re: [TSVN] Usage/Integration of Diff scripts?

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-07-21 16:47:13 CEST

Reinhard Brandstaedter <reinhard.brandstaedter@ams-engineering.com> wrote
on 07/21/2005 10:37:12 AM:

> I thought maybe there are some issues with encoding style of these
> files. because as soon as I get a Word Document in conflicted state i
> can not open the Base-Document (The one that usually contains the
> ">>>>>>>>" and "<<<<<<<<" comments when it's a text file)
> Scenario: updating the working copy enters a conflicted state for a word

> document. Which results in the usual files:
> .doc > not a valid word file anymore
> .doc.mine > valid word file
> .doc.rXX > valid word file
> .doc.rYY > valid word file
> With text files i would call "edit conflicts" which calls the merge
> program with the appropriate parameters (vbs file for .doc files).
> This is the way it's meant to be, right? I just doesn't work properly
> with word/binary files yet.
> I wanted to call the vbs for merging from the commandline and use the
> .mine, .rXX and .rYY of the conflicted file and create a new .merged
> file but this didn't work.
> But not a big issue...time will come and merging of word files will
> work... or we switch to professional documentation formats TeX maybe :-)

Subversion should not be putting problem markers in your file. There must
not be an svn:mime-type property associated with the files. Normally,
when you add a .doc Subversion automatically sets is to
application/octet-stream. Try adding that property to the files then it
should work correctly.


Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jul 21 16:47:34 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.