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

Re: Proposed changes to mod_dav_svn/merge.c

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2001-10-17 01:03:32 CEST

kfogel@collab.net writes:

> Instead, we can do one of two things:
>
> SOMEWHAT CLEAN:
> Change the code in the RA layer that interprets the response,
> such that it doesn't invoke the bumping function so faithfully.
>
> VERY CLEAN:
> Change the *bumping* functions, which are actually part of the
> working copy library and thus part of the wc semantics, to be
> more sophisticated about when they bump.

So here's what Karl and I did.

We hooked the "tracking" editor into ra_dav (it was formerly being
used only by ra_local). This magical editor creates a list of
committed targets that need to be revision-bumped in the working copy;
specifically, it knows to ignore directories most of the time (unless
a dir receives a propchange.) In other words, this editor understands
the loose mixed-revision rules that the working copy allows.

So when ra_dav is parsing the merge response (after the commit
finishes on the server), this list of "valid" targets is examined. If
the target isn't in the list, then ra_dav isn't allowed to to touch
it. The merge response is still complete, and ra_dav is still happily
parsing it. We've just added a filter.

This is the "somewhat clean" solution. The "very clean" solution
turned out to be a huge amount of work and redesign.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:44 2006

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