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

Re: Diff file creation

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-05-12 11:35:33 CEST

Bob Fletcher wrote:

> Thanks for a wonderful product.
>
> I am not sure this is really a bug or simply operator error. The problem may also
> be complicated by the fact that I am using WinMerge.
>
> Occasionally I want a unified diff file of my working copy with an earlier
> revision - say Rev 45. This is easily done with the subversion command:
> svn diff -r 45 > diff.txt
>
> I expected to be able to easily do this with TortioseSVN as well,
> but I keep having problems. In my working copy, I do 'Show log', select the
> desired revision and right-click to open the Context Menu.
> Selecting "Compare with working copy" brings up TortoiseMerge and a pane of the
> changed files. This is great, but I can't find the actual diff file.

"Compare with working copy" creates that diff, but that command is an
'UI' diff command, which means it has to start TortoiseMerge so you can
see an UI diff of that patchfile. Because there's no other UI diff tool
out there besides TortoiseMerge (that I know of) that can apply a
patchfile to a working copy.

> So then I repeat the process and in the Context Menu select the option
> "Show changes as unified diff". Now I get a WinMerge screen and a "Select Files
> or Folders" menu. The Left: field is filled in with
> C:\Documents and Settings\rfletcher\Local Settings\Temp\Test.diff.003.tmp.diff
> the Right: field is blank and invalid, and I am stuck.

That's the correct way to get a unified diff.
But you have some configurations done wrong. Go to the settings dialog.
In the tree on the left, select "Unified diff viewer" below "External
Programs". You can there configure a viewer for unified diff files.
It seems you've set there WinMerge as the diff viewer, but WinMerge
can't deal with those! WinMerge takes *two* files to diff, not just a
unified diff. Usually, you specify there some text editor which might
have syntax coloring for unified diffs - if you leave it empty
(default), the default text editor configured on your system is used
(notepad.exe).

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat May 12 11:35:52 2007

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