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

Re: [TSVN] merge-doc.vbs and diff-doc.vbs workaround

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-08-05 17:47:53 CEST

Hans-Emil Skogh <hans-emil.skogh@tritech.se> wrote on 08/05/2005 11:41:38
AM:

> I have done some testing of the merge-doc.vbs script. It seems like the
> problem with being unable to diff a word document after a successful
merge
> is solved by choosing "Accept All Changes in Document" before saving the
> merged document. (Or really, before trying to run a diff.)
>
> Is it possible (or desirable) to add functionality to the script so that
> "Accept All Changes in Document" is triggered automatically upon saving?
>
> Other than that the merge-doc script appears to work reasonably well. I
hope
> that it could be installed by default in the next TSVN release.

Hmmm. Does this manifest itself in the Word UI at all? It seems like we
wouldn't want to programmatically do this, as I imagine it would cause the
results of the merge to essentially be hidden. Perhaps the script could
just have a MsgBox call added to it to let the user know that they need to
do this option in Word once they are satisified with the merge? I would
assume they could save the document once or twice before doing this action
without problem, so long as it is eventually run?

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 Aug 5 17:48:34 2005

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