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

Re: Resolve conflict on MS Word (97-1003) merge-doc.js error

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 24 Feb 2015 20:22:16 +0100

On 24.02.2015 18:28, Junio Fernandes wrote:
> Hi.
>
> I got a conflict on 3 MS Word (97-2003) files after a merge. Trying to
> resolve one conflict, MS Word 2010 opened 3 windows of the same file
> (distinct revisions). Them I received the following error and no idea
> how to resolve it.
>
> ---------------------------
> Windows Script Host
> ---------------------------
> Script:C:\Program Files\TortoiseSVN\Diff-Scripts\merge-doc.js
> Linha:100
> Caract.:5
> Erro:O método ou a propriedade Compare não está disponível porque a
> seleção atual está bloqueada para edição.
> Código:800A11FD
> Origem: Microsoft Word
>
> ---------------------------
> OK
> ---------------------------
>
> Line: 100
> Error: The Compare method or property is not available because the
> current selection is locked for editing.
> Code: 800A11FD
>
> I'm using:
> Windows 8.1 OS 64 bits (pt-BR)
> TortoiseSVN 1.8.10 (en)
> Subversion 1.8.11
> MS Office 2010
> The MS Word file is 97/2003 .doc
>
> Merge tool command line for .doc extension:
> wscript.exe "C:\Program Files\TortoiseSVN\Diff-Scripts\merge-doc.js"
> %merged %theirs %mine %base //E:javascript
>
> I got newest merge-doc.js file but it only change the line of error to 104.

Try changing the word.Documents.Open lines to
word.Documents.Open(docname, false, false);

maybe that helps: the first 'false' indicates to not show a conversion
confirmation dialog, and the second one forces the doc to be opened as
readonly.

Also, try to open only the second and third file as readonly if opening
all as readonly fails.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3100942
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-02-24 20:22:24 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.