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

SV: [TSVN] Re: Minor bug report: diff-script for doc files closes document immediately

From: Hans-Emil Skogh <hans-emil.skogh_at_tritech.se>
Date: 2005-09-23 12:50:21 CEST

>>>I'll try again with my home pc.
>> Please do!
>
> Sorry for the delay.

Ah. Don't be. Take the time when you have it. This is a voluntary effort,
after all.

> I tried on my home pc and, alas, the result is identical: the
> merge() method fails on office 2000.

Too bad...

> I then tried to execute a merge between 2 documents interactively using
> msword's menus. A popup appears: "The merged documents contain unmarked
> changes. Do you want to merge up to the first untracked change?".
> Choosing either "yes" or "no" does nothing.
> See MS KB191030 article.

Ah. This KB article explains a lot!

> Apparently the API is the same but the internal workings of the merge
> functionality differs. I don't know what a marked/tracked change is, I
> never used word's revisions system.

I have only used it briefly in conjunction with getting the word-merge
scripts in order for TSVN.
When tracked changes is activated in word, the changes made to the document
is tracked. That is, you can display all changes made to that document after
tracking was turned on.
The KB article makes it evident that pre word XP supports merging *only* on
changes made with tracking activated.
(Word 2003 will merge documents and insert the changes as tracked changes, a
sort of post activation of the tracked feature.)

> I think the best choice is to support office XP and later versions only.

Could you please try to create a document, make a copy of it, activate
change-tracking in both (refer to word help on how to do this), make some
changes to each document and then try to merge them.
According to my understanding of the KB article, this should work. In that
case, we can support pre office XP-versions with the requirement that
tracking has to be turned on manually on each document.
This could be hinted with a message-box, much in the same way that the
message-box today informs of the possible ill effects on diffing unpropperly
"cleaned" merged documents. (Not that pretty, but maybe better than nothing
at all?)

If it doesn't work, we'll have to abandon merge support completely for pre
office XP versions...

Hans-Emil

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Sep 23 12:50:49 2005

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