[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 21:24:16 CEST

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

> Mark Phippard wrote:
> > Oh yeah. To run the merge script:
> >
> > wscript.exe "C:\Program Files\TortoiseSVN\bin\merge.vbs" %base %theirs

> > %merged
>
> Is the 'wscript.exe' really required? vbs files should be associated
> with the wscript.exe anyway so it should work without that?

If you think we can rely on that, I am fine with it. I do not know.

> Another thing:
> I wrote a function in TSVN which scans a folder for scripts and
> registers them automatically. To make this work, the script must follow
> some rules:
>
> diff-ext %base %mine
> merge-ext %merged %theirs %mine %base
>
> So if your script doesn't need the %merged param, you still should take
> the param but simply ignore it.

Sure, new merge script attached. Compare already works that way.

> > BYW, when I did this the %mine variable contained the path to the
folder,
> > not the path to the file.
>
> You mean TSVN called the file wrong?

I think so. I displayed the contents of the argument and it was just the
folder name. In what way would the %merged and %mine normally differ
anyway? When I displayed the variables, %merged was my document, %base
and %theirs were the correct rXXX versions and %mine was the path to the
folder containing the document.

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

  • application/octet-stream attachment: merge.vbs
Received on Fri Jul 8 21:24:38 2005

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