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

RE: Re: diff-docx.js

From: Bryan Evenson <bevenson_at_melinkcorp.com>
Date: Wed, 19 Oct 2011 06:15:09 -0700 (PDT)

> On 18.10.2011 16:54, Bryan Evenson wrote:
> > I just had a similar issue.
> >
> > My setup: OS: Windows 7-64 bit MS Office version: Office 2007 32-bit
> > Previous Tortoise SVN install: version 1.6.16, both 32-bit and 64-bit
> > clients
> >
> > This was my setup as of yesterday. I then upgraded to TortoiseSVN
> > 1.7 (64-bit installer) to be the Guinea Pig for the office. Before
> > upgrading, TortoiseSVN asked me to uninstall 32-bit version of
> > 1.6.16. I then uninstalled the 32-bit version as requested,
> > rebooted, upgraded to Tortoise 1.7 64-bit, and rebooted.
> >
> > When I went to do a diff of a .docx file, I got an error saying "Can
> > not find script file 'c:\Program
> > Files(x86)\TortoiseSVN\Diff-scripts\diff-docx.js'".
> >
> > From browsing the TortoiseSVN source repository, it looks like all of
> > the diff-*x.js and merge-*x.js files that existed under the 1.6.x
> > branch are no longer present in the 1.7.x branch (compare
> > svn/branches/1.6.x/contrib/other/diff-scripts with
> > svn/branches/1.7.x/contrib/diff-scripts). Was this the intent? If
> > so, is there a way for the 1.7.x installer to make the redirection
> > adjustments for us?
>
> You could try to remove the registry keys under
> HKCU\Software\TortoiseSVN\DiffTools
> and
> HKCU\Software\TortoiseSVN\MergeTools
>
> if those keys are not present, then TSVN automatically creates the keys
> for the existing scripts.
>
> Stefan
>
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.net

With that advice, I think I found the solution that will be easiest to explain to the non-computer savvy users in the office (and those that are most likely to want diff to work for a Word document).

1. Go to Context Menu->Tortoise SVN->Settings.
2. Go to External Programs->Diff Viewer and click the "Advanced..." button.
3. Remove all of the entries and click OK.
4. Go to External Programs->Merge Tool and click the "Advanced..." button.
5. Remove all of the entries and click OK.

TortoiseSVN will then create new keys for all the major file types utilizing the existing script files.

-Bryan

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2858821

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-19 15:15:16 CEST

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.