[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 20:43:48 CET

Greg Stein <gstein@lyra.org> writes:

> On Thu, Nov 13, 2003 at 10:13:25AM -0600, C. Michael Pilato wrote:
> >...
> > 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():
>
> Ah! Right. For some reason, I thought it was always used by the client.
> But I see now... okee dokee.
>
> So back to the original question: yes, things could certainly be arranged
> to avoid a delta and just replay the changes table. Should work just fine.
> The actual MERGE response is flat, anyways.

Cool. The code is written; passes 'make davcheck' and a battery of
hand tests aimed at jukin' it. But I'm going to hold off until after
the 0.33 release to commit the change.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Nov 13 20:44:53 2003

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