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

Re: Thoughts on the DAV MERGE request.

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2003-11-13 17:13:25 CET

Greg Stein <gstein@collab.net> writes:

> On Thu, Nov 13, 2003 at 01:34:24AM -0600, C. Michael Pilato wrote:
> >...
> > The point of the MERGE response is to tell the client what resources
> > changed as a result of the MERGE. For our purposes, that means
> > reporting all the items actually committed, not including bubble-up
> > directories.
>
> Right. That is the definition / process for MERGE.
>
> *However* ... we disabled that walk some time ago. It was creating an O(n)
> behavior for commits. For regular DeltaV clients, they'll get a "proper"
> MERGE response. The SVN client tells the server "don't bother. I already
> know the changed resources."
>
> See the 'disable_merge_response' variable in merge.c

I see that variable, but ... it's variable. And unless ethereal is
making stuff up, we most certainly do use the MERGE. If my reading is
correct, we only disable the MERGE details (the resource) stuff when
the user is doing a working-copy-less commit (svn rmdir URL, svn
import URL, etc.). This from get_commit_editor():

  /* If the caller didn't give us any way of storing wcprops, then
     there's no point in getting back a MERGE response full of VR's. */
  if (ras->callbacks->push_wc_prop == NULL)
    cc->disable_merge_response = TRUE;

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Nov 13 17:19:10 2003

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