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

Re: Oddity with svn diff on moved/renamed files.

From: Brian Denny <brian_at_briandenny.net>
Date: 2004-04-08 15:54:55 CEST

On Thu, Apr 08, 2004 at 04:16:38PM -0500, Ben Collins-Sussman wrote:
>
> This is a tricky UI problem. On the one hand, the "A +" isn't really
> new, it's a copy. So if the user is running 'svn diff' in order to
> examine local mods before committing, the current behavior makes sense.

I don't get this. For an atomic 'svn mv', i suppose it would make sense.
But for a copy? It's a new file. Just because it has history...

Oh, now I get it. It has a history, and the difference between the
current state and the previous state in the history is "nothing".

> Any ideas about how to satisfy *both* use cases?

Another way of looking at the problem is: From the perspective of the
added-with-history file, no lines have been added/changed; but from the
perspective of the whole working copy, a bunch of lines (the new copy)
have been added.

So I'd say what we need is a patch format which can express the idea of
copy-with-history. :-)

Meantime, my vote is to generate the add-diff. We're all so used to
tools which *don't* follow copy history that it's not hard to ignore
that output if it's irrelevant to your use case. If you want a patch,
OTOH, it's very necessary.

-brian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 8 23:44:59 2004

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.