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

Re: [Issue 2543] Inconsistent svn diff after rename

From: Malcolm Rowe <malcolm-svn-dev_at_farside.org.uk>
Date: 2006-05-10 12:26:24 CEST

On Tue, May 09, 2006 at 04:38:15PM -0500, Ben Collins-Sussman wrote:
> On 5/9/06, Andreas Hasenack <ahasenack@terra.com.br> wrote:
> >I think we are not understanding each other. What I would like to have
> >is that svn diff right after svn mv should show exactly what it shows
> >after the commit is made. Currently it shows something different.
> This debate has been going on for years.
> If I 'svn copy' (or 'svn mv', since mv == 'cp; rm' right now) a file,
> then 'svn diff' shows nothing at all. If I then make tweaks to the
> copied file, 'svn diff' shows me just the tweaks.

Actually, that's not right. Unless you restrict the target to just the
new file, it shows the deletion of the original file and also (as you
mentioned) a diff of the new file against the copyfrom source.

Or at least, it does in 1.3.0, and I don't think we've changed it since.

However, repos->wc diffs don't currently take account of copyfrom
information, so those diffs show a complete add and a complete delete.

Unless there are two radically different use cases that I've been missing,
I'm of the opinion that this is a bug (though I'm not sure which way to
resolve it) - I think that in:

svn diff
svn ci [ commits rN ]
svn diff -rN-1

The two 'svn diff's should give equivalent output.

(Also to note that 'svnlook diff' is inconsistent with 'svn diff' in
this area as well.)


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed May 10 12:27:01 2006

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

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