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

Re: Tortoise Edit Conflicts - Runtime Error in Microsoft JScript

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 15 Jan 2009 19:36:50 +0100

kschuster_at_igepa-its.de wrote:
> Hello, I use the Tortoise SVN Client 1.5.6 and Subversion 1.5.5-1.
> What I wanted to do is 'Edit Conflicts' on a document edited by two
> users. The first one commited his changes and all seems okay. The
> second one tried to commit his changes and rises an conflict. By
> right-clicking on the document and choosing 'Edit Conflicts' I got
> the following error message:
>
> 'Runtime error in Microsoft JScript' Code 800A00D
>
> I'm not very familiar with SVN at all and I'm not able to finally say
> if it is a bug or not

Please get the latest script file from
http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/contrib/other/diff-scripts/merge-doc.js
(username: guest, leave password empty)

and copy the file to c:\program files\tortoisesvn\Diff-Scripts

and then try again. It *should* work, but I'm not sure since I don't
have office installed myself.

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=1026829
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-01-15 19:37:37 CET

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