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

Re: [TSVN] VBScript for comparing two MS Word documents

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-07-08 18:25:23 CEST

SteveKing <steveking@gmx.ch> wrote on 07/08/2005 12:16:39 PM:

> Mark Phippard wrote:
> > I have attached a VBScript for comparing two MS Word Documents.
> >
> > In TortoiseSVN, you can configure this to be the diff viewer for .doc
file
> > types. Just specify a command like this:
> >
> > wscript.exe "C:\Path to script\compare.vbs" %base %mine
>
> Is this ok that way? Or is this just an example. (apart from the path to

> the script I mean).

Yes, on my system I have this:

wscript.exe "C:\Program Files\TortoiseSVN\bin\compare.vbs" %base %mine

You could probably create a scripts subfolder, or something like that if
you prefer.

> > I offer this to the TortoiseSVN project. Feel free to improve it. I
> > think it would be cool if TortoiseSVN included the script and
> > pre-configured the association in the registry as part of the
installer.
>
> I can do that. But I can't really test it because I don't have word
> installed. If others can confirm that it works, I'll add the registry
> settings and include the script in the installer.
>
> > AFAICT, Word does not offer a 3-way merge capability, although it does

> > have a 2-way merge. You could possibly write a merge script that
merges
> > the base with theirs, and then takes the result and merges in yours. I
am
> > not sure what kind of results that would yield. If TSVN would like to

> > include this script, I could look into a merge script too.
>
> If it works, I'll include it. But as I said - I can't test it myself.

I will take a look at doing a merge script. Hopefully someone else can
test this script and verify it.

Mark

_____________________________________________________________________________
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 Fri Jul 8 18:25:44 2005

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