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

Re: [TSVN] Feature Request: Alternative to Unified Diff

From: Steve Williams <stevewilliams_at_kromestudios.com>
Date: 2005-04-21 09:11:11 CEST

SteveKing wrote:
>>Yes, it's not quite the same as what you want. But all of the
>>functionality is there. It just needs to be extended to show the diffs
>>between two selected folder revisions, not just between the selected
>>revision and the working copy.
> No, the functionality is _not_ there, and it can't be 'extended'. It
> would be a completely different function. You see, if you select two
> revisions to diff, you _don't_ have one of the two 'diffing partners'
> available, you have none of them. So you can't simply diff one against
> the other and use TMerge to show the patch - you don't have anything
> to show the patch against!
> To do a graphical diff between two revisions, we'd have to check out
> one revision completely and then do a diff against that. I don't think
> that's what you really want - checking out a complete revision just to
> show a diff.

Ok, so even if the GUI parts are there (the file list, clicking on a
file shows a diff), the behind-the-scenes functionality is not there,
and is quite difficult going by what you say. The real problem is that
you do not have the full-text of one revision to apply the diff to,
because all you have is the diff itself.

Just a thought. The list of files affected is presented by the diff,
which TMerge can show in the list. When a file is selected from the
list, would TMerge be able to ask the server for the full-text (svn cat
filename) of the first revision to apply the diff against and show that?
  It may take a little while to get the file from the server before
displaying it, but would it be possible?

Or am I completely on the wrong track here?

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Apr 21 09:11:33 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.