[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:50:52 CEST

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

> Mark Phippard wrote:
> > I used Update to create a local conflict. Then did Edit Conflicts.
>
> Strange. The %merge should be the path of the file you executed "Edit
> conflicts" on. As done in SVN::StartConflictEditor().

%merged was the path to the file I selected. It is %mine that was wrong.
It was the path to the parent folder.

Here is a simple test script that just displays the variables:

option explicit

dim objArgs,num,sTheirDoc,sMyDoc,sBaseDoc,sMergedDoc

Set objArgs = WScript.Arguments
num = objArgs.Count
if num < 4 then
   MsgBox "Usage: [CScript | WScript] merge.vbs %merged %theirs %mine
%base", vbExclamation, "Invalid arguments"
   WScript.Quit 1
end if

sMergedDoc=objArgs(0)
sTheirDoc=objArgs(1)
sMyDoc=objArgs(2)
sBaseDoc=objArgs(3)

MsgBox "%merged - " + sMergedDoc
MsgBox "%theirs - " + sTheirDoc
MsgBox "%mine - " + sMineDoc
MsgBox "%base - " + sBaseDoc

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 21:51:10 2005

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