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

Re: svn diff, svn merge, and vendor branches (long)

From: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2002-12-09 19:48:45 CET

On Mon, 2002-12-09 at 13:41, Ben Collins-Sussman wrote:
> Well, I was pondering this question too. We use dir_delta all over
> the place... svn diff, svn merge, svn up, svn switch. Is there ever a
> time where we definitely *should* see a delete+add instead of a patch?
> I think cmpilato had an example.

When you're doing a commit, there is a single correct tree delta (a
reflection of the operations performed in the wc) and it is important
that it is transmitted and recorded accurately. But of course
svn_repos_dir_delta() is not used during a commit.

When you're talking to a working copy, the only thing that matters is
the end state. For an update or switch, the end state is easily defined
and any delta which gets you there is fine.

I guess the relevant question is in merge. If we are merging "delete
foo and replace foo with unrelated file" with "modify the contents of
foo", then we should get a directory-level conflict; my proposed change
would produce a file-level merge. So I guess we can throw out my idea.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Dec 9 19:57:40 2002

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