[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: SteveKing <steveking_at_gmx.ch>
Date: 2005-07-08 21:12:45 CEST

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?

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.

> 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?

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jul 8 21:13:04 2005

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