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

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

From: Davide Orlandi <davide.orlandi_at_synago.it>
Date: 2005-09-23 15:52:35 CEST

Hans-Emil Skogh wrote:

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

You are right, it works.
I tried with a change-tracking-enabled document, checked out and
modified in two different working copies to create a conflict: selecting
"resolve conflicts" word pops up with no errors.

I'm not sure about the result of the merge: I changed only a few lines
in the documents but word displays a page containing two contiguous full
copies of the text (all in red).

And one final humiliation: the merge script works when change-tracking
is on, but the diff-script fails on "destination.Compare(sBaseDoc)" line
with a "command failed" error :/

Well, I'm migrating to openoffice anyway :)

-- 
Davide Orlandi
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Sep 23 15:52:58 2005

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