[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: Bob Fletcher <robert.h.fletcher_at_ieee.org>
Date: 2007-05-12 18:48:55 CEST

Simon Large <simon.tortoisesvn <at> googlemail.com> writes:

>
> On 12/05/07, Stefan Küng <tortoisesvn <at> gmail.com> wrote:
> > Bob Fletcher wrote:
> >

...

> >
> > That's the correct way to get a unified diff.
>
> But that only shows the diff for that one revision, not a diff between
> revN and the WC.

Yes, I see.
>
> > 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, You were correct. I had WinMerge set for the "Unified diff viewer".
When I specified a text editor, I could then edit and save the file.

Simon. You were also correct. Selecting "Show changes as unified diff" in the
Context Menu creates a diff between the selected revision and the previous
revision - not with the working copy.
Oh well, I can always commit my changes, select both the Head and the desired
revision and do a "Show changes as unified diff" on the two revisions.

Thanks very much to you both.
Bob

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat May 12 19:08:13 2007

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