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

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

From: Hans-Emil Skogh <hans-emil.skogh_at_tritech.se>
Date: 2005-08-05 18:37:18 CEST

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

> Hmmm. Does this manifest itself in the Word UI at all?

If you mean "Accept All Changes in Document" it is available in the
"Reviewing" toolbar. It appears automatically for me after doing a merge.
The icon for accepting a change looks like a blank paper with a blue check
and a pen over it.
If you mean if the "Accept All Changes in Document" makes any difference in
the UI. Provided you are showing the document as "Final with Markup" or
"Original with Markup" (from the said toolbar). This markup disappears when
accepting changes.

Or did I misunderstand your question?

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

Well, the *results* of the merge would not really be hidden, since you could
diff it with an earlier revision. But if you accidentally (or willingly)
save the document before finishing the manual merge-work, you do get a
What you do loose in any case is any other in-word-change-tracking that you
were doing before the merge. But this is the way word works. Not much to do
about it. (I guess the same goes for the merge->diff w.o. accepting changes
problem as well...)

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

Sounds like a good plan, if there is no way to do it safely automatically
(and I suppose there isn't).

> I would assume they could save the document once or twice before
> doing this action without problem, so long as it is eventually run?

Yes. That is how it seems to work for me. Could somebody else try it out and


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Aug 5 18:37:45 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.