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

Re: svn commit: r22905 - branches/merge-tracking/subversion/libsvn_ra_serf

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-01-05 20:49:20 CET

On Fri, 05 Jan 2007, Daniel Rall wrote:

> On Fri, 05 Jan 2007, Julian Reschke wrote:
> > Justin Erenkrantz schrieb:
> > >On Thu, Jan 04, 2007 at 10:20:42AM -0800, dlr@tigris.org wrote:
> > >>Ideally, we'd avoid issuing a "get-merge-info" REPORT at all when the
> > >>server doesn't understand it. However, this capabilities discovery
> > >>would have to happen in a previous request (e.g. one of the many
> > >>PROPFINDs we issue during a 'merge'). Any ideas on how to implement
> > >>that are most welcome...
> > >
> > >ra_serf could do that via an OPTIONS request (it already uses this for
> > >commits). mod_dav_svn would need to advertise what it's capable merge-wise
> > >of in response to that, but that should be possible. -- justin
> >
> > RFC3253 requires that the set of supported reports is made available in
> > the live property DAV:supported-report-set (see
> > <http://greenbytes.de/tech/webdav/rfc3253.html#rfc.section.3.1.5>).
> Hmmm, we don't seem to be doing this on trunk. Thanks for the tip,
> Julian -- I'll look into adding it to mod_dav_svn.

Section A of RFC 3253 indicates that the live property
DAV:supported-report-set is not supported for resources of type:

- DeltaV-compliant unmapped URL (a URL that identifies no resource)

- Checked-out resource

In subversion/mod_dav_svn/liveprops.c:insert_prop(), I think the
first case is already covered:

  if ((! resource->exists)
      && (propid != DAV_PROPID_version_controlled_configuration)
      && (propid != SVN_PROPID_baseline_relative_path))

I'm trying to detect the second case later on in the same function.
According to mod_dav.h
any resource->type == DAV_RESOURCE_TYPE_WORKING is likely to fit the
bill here. However, I'm wondering whether I need to support this for
any resource->working == TRUE, perhaps when resource->type ==

  • application/pgp-signature attachment: stored
Received on Fri Jan 5 20:49:17 2007

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