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

Re: [TSVN] "diff" command in context menu when selecting an added file

From: Will Dean <svn_at_indcomp.co.uk>
Date: 2005-01-06 10:18:13 CET

At 08:56 06/01/2005 +0100, you wrote:

>_after_ the commit, it has a base, yes. But not before! And after a
>commit, you only have moved/copied the file and not added new. That's
>a little bit different.


I think the OP has presented this in a rather confusing fashion, but does
have a genuine point.

He's talking about the special-case where you SVN copy a committed file
(which makes the copy show as 'added', but it *does* have a base). Then
you modify the copied file, and before you commit, you want to see the diff
from the original.

Because the file is copied from a committed file, it *does* have a base, so
diffing against the base is a legitimate thing to do, which I imagine could
actually be useful.

I don't think his patch is quite right though, because in the most common
case of an added file, there is no sense in allowing diff, and the current
behaviour is correct.

I would suggest that if a file is 'added', we then check for the existence
of a base-file and only offer the diff option if the base exists. I think
this might be somewhat tedious to do, because GetPristinePath isn't
currently available in the shell extension.

Otherwise, as you say, you're trusting that the merge program can cope with
empty files.

I'll look at this.



To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jan 6 10:18:57 2005

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