[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 14:51:40 CEST

Reinhard Brandstaedter <reinhard.brandstaedter@ams-engineering.com> wrote
on 07/21/2005 08:47:57 AM:

> I've seen that there is a feature to create customized diff scripts
> (which is really cool). I'm very interested in that feature because it
> would mean I can develop own scripts for our needs.
> I just beginning to play around with that and I'm trying to use the
> Word/OO diff/merge scripts.
> I see that the diff of word files is called fromt he tortoise context
> menu with the normal diff/merge command if you set proper application
> handlers for the extensions.
> Now I've tried to merge a conflicted word (Word 2002) file but all i get

> is a file with garbage in it when it's displayed in word.
> Is there any conversion made on the file when it's opened/in a
> conflicted state?

I wrote the scripts. I wouldn't recommend using the merge script. It
seemed to work for me, but after I do a merge I can no longer use diff on
that document.

What sort of conversions are you talking about? It just takes the three
MS Word documents and runs the Word merge command. Actually, it does not
need to use the Base document.


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 14:52:09 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.