[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:37:10 CEST

Mark Phippard wrote:
>>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.

%merged usually doesn't exist yet or is the same as %mine. %merged is
the path where the result of the merge should be saved.

How exactly did you call the diff with TSVN? From the explorer context menu?


   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:37:30 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.