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

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

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-07-08 21:10:11 CEST

Here is a better merge script. Run it like this:

wscript.exe "C:\Program Files\TortoiseSVN\bin\merge.vbs" %theirs %merged

This still has the problem that once you do the merge the compare option
no longer works.

Also, found a TortoiseSVN bug. When you do Check for Modifications and
show an incoming change from the repository, the Compare with WC option
just runs TortoiseMerge. It does not use the custom program.

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:11:46 2005

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