On Tue, May 26, 2009 at 11:20 AM, Hyrum K. Wright<hyrum_at_hyrumwright.org> wrote:
> Author: hwright
> Date: Tue May 26 08:20:48 2009
> New Revision: 37825
>
> Log:
> Merge r37745 from trunk:
>
> * r37745
> Fix an *ancient* bug that permits the setting of properties on out-of-
> date directories over ra_neon when wcprops cache isn't populated.
> Justification:
> Modifying out of date dirprops? That ain't how we roll.
> Votes:
> +1: cmpilato, arfrever, hwright
>
> Modified:
> branches/1.6.x/ (props changed)
> branches/1.6.x/CHANGES (props changed)
> branches/1.6.x/STATUS
> branches/1.6.x/subversion/libsvn_ra_neon/commit.c
> branches/1.6.x/subversion/tests/cmdline/switch_tests.py
>
> Merged:
> /trunk:r37745
>
> Modified: branches/1.6.x/STATUS
> URL: http://svn.collab.net/viewvc/svn/branches/1.6.x/STATUS?pathrev=37825&r1=37824&r2=37825
> ==============================================================================
> --- branches/1.6.x/STATUS Tue May 26 08:19:17 2009 (r37824)
> +++ branches/1.6.x/STATUS Tue May 26 08:20:48 2009 (r37825)
> @@ -124,11 +124,3 @@ Approved changes:
> Improve BASH completion.
> Votes:
> +1: arfrever, stylesen
> -
> - * r37745
> - Fix an *ancient* bug that permits the setting of properties on out-of-
> - date directories over ra_neon when wcprops cache isn't populated.
> - Justification:
> - Modifying out of date dirprops? That ain't how we roll.
> - Votes:
> - +1: cmpilato, arfrever, hwright
>
> Modified: branches/1.6.x/subversion/libsvn_ra_neon/commit.c
> URL: http://svn.collab.net/viewvc/svn/branches/1.6.x/subversion/libsvn_ra_neon/commit.c?pathrev=37825&r1=37824&r2=37825
> ==============================================================================
> --- branches/1.6.x/subversion/libsvn_ra_neon/commit.c Tue May 26 08:19:17 2009 (r37824)
> +++ branches/1.6.x/subversion/libsvn_ra_neon/commit.c Tue May 26 08:20:48 2009 (r37825)
> @@ -631,10 +631,7 @@ static svn_error_t * commit_open_root(vo
> /* create the root resource. no wr_url (yet). */
> rsrc = apr_pcalloc(dir_pool, sizeof(*rsrc));
> rsrc->pool = dir_pool;
> -
> - /* ### should this be 'base_revision' here? we might not always be
> - ### working against the head! (think "properties"). */
> - rsrc->revision = SVN_INVALID_REVNUM;
> + rsrc->revision = base_revision;
>
> rsrc->url = cc->ras->root.path;
> rsrc->local_path = "";
>
> Modified: branches/1.6.x/subversion/tests/cmdline/switch_tests.py
> URL: http://svn.collab.net/viewvc/svn/branches/1.6.x/subversion/tests/cmdline/switch_tests.py?pathrev=37825&r1=37824&r2=37825
> ==============================================================================
> --- branches/1.6.x/subversion/tests/cmdline/switch_tests.py Tue May 26 08:19:17 2009 (r37824)
> +++ branches/1.6.x/subversion/tests/cmdline/switch_tests.py Tue May 26 08:20:48 2009 (r37825)
> @@ -2542,7 +2542,7 @@ test_list = [ None,
> relocate_beyond_repos_root,
> refresh_read_only_attribute,
> switch_change_repos_root,
> - XFail(relocate_and_propset, svntest.main.is_ra_type_dav),
> + relocate_and_propset,
Hi Hyrum,
This should actually be something along the lines of
> - XFail(relocate_and_propset, svntest.main.is_ra_type_dav),
> + XFail(relocate_and_propset, svntest.main.is_ra_type_dav_serf),
The revision which fixes this test over ra_serf is Mike's r36271 has
not been backported to 1.6.x, so this test still fails over ra_serf on
1.6.x. One problem is that is_ra_type_dav_serf doesn't yet exist on
1.6.x either, it is part of r36298. I'll nominate the latter in a
moment to make this easier.
Paul
P.S. Mike I'm ccing you in case r36271 *should* be nominated for
backport -- it would seem so).
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2360409
Received on 2009-06-08 20:52:55 CEST