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

Re: [PATCH] diff base->repos failed to trace a moved file

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: 2006-03-13 13:03:42 CET

Malcolm Rowe wrote:
> On Mon, Mar 13, 2006 at 11:22:36AM +0000, Julian Foad wrote:
>
>>From a high level point of view: why should comparing a directory show
>>changes to a file in a different way from comparing the file?
>
> Only because we don't support moves as a distinct logical operation;
> the directory case is essentially a superset of the file case where we
> additionally see the delete of the original file.
>
> (alternative answer: it shouldn't, and won't, I hope, when we get
> 'real moves').

Good!

>>From a low level point of view, "supports copyfrom" is the crucial phrase.
>>I wonder what we mean by this.
>
> Yes, me too. If you look in libsvn_wc/diff.c, you'll see the comment
> "### TODO: Do we need to support copyfrom?". I'm not entirely sure,
> but I suspect it might be the difference between reporting a file_changed
> and file_added event for the copied files.

OK, that's something to investigate and cogitate on.

For now, are you OK with me committing that patch and test which includes the
comment:

> + # It's not clear whether we expect a file-change diff or
> + # a file-delete plus file-add. The former is currently produced if we
> + # explicitly request a diff of the file itself, and the latter if we
> + # request a tree diff which just happens to contain the file.

or would you prefer me to change the comment (to avoid saying that it's not
clear, perhaps)?

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Mar 13 13:05:24 2006

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