Re: [TSVN] external diff and changing file extensions

Mike Wohlgemuth wrote:
> I am attempting to use an external diff for Microsoft Word documents.
> The diff program uses the file extension on the file to determine the
> type, and when it finds 2 Word docs, it starts up Word and uses its diff
> and merge features. The problem is that tortoisesvn changes the file
> extension on the file it pulls from the repository. For instance, if I
> have the file
>
> c:\svn\test.doc
>
> and I attempt to do a diff on the file, tortoisesvn grabs the file from
> the repo and puts it in
>
> c:\svn\.svn\text-base\test.doc.svn-base
>
> and then calls the external diff. My diff doesn't know what to do with

Just to clarify some thing here (since others already told you how to
solve this problem):
TortoiseSVN does _not_ change the extension of the file, it does _not_
pull the file from the repository and it does _not_ put it in
.svn\text-base\!
All files in your working copy have a so called 'base copy' inside
.svn\text-base. That's how Subversion is able to determine if you've
changed a file and how you changed it. TSVN then just starts the diff
tool with the 'normal' file in your working copy and the base copy
(which is the file *before* you started modifying it).

And a warning: NEVER, EVER change the file(s) inside the .svn directory
manually!

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org