You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2009/05/15 20:36:52 UTC
Re: svn commit: r37745 - in trunk/subversion: libsvn_ra_neon
tests/cmdline
Holy crap!! You da man!
<wipe-nostalgic-tear-in-eye/>
On May 15, 2009, at 12:26, "C. Michael Pilato" <cm...@collab.net>
wrote:
> Author: cmpilato
> Date: Fri May 15 12:26:42 2009
> New Revision: 37745
>
> Log:
> The answer to a question posed long, long ago is, apparently, "Yes".
>
> Fix an ancient bug in libsvn_ra_neon that was masked by the wcprops
> cache and only revealed when wc-ng and its broken wcprop cache support
> went "live".
>
> * subversion/libsvn_ra_neon/commit.c
> (commit_open_root): Set rsrc->base_revision to the value of the
> passed-in base_revision instead of SVN_INVALID_REVNUM.
>
> * subversion/tests/cmdline/switch_tests.py
> (relocate_and_propset): Remove big comment claiming this test was
> failing over ra-neon.
> (test_list): Lose XFail() for relocate_and_propset() test.
>
> Modified:
> trunk/subversion/libsvn_ra_neon/commit.c
> trunk/subversion/tests/cmdline/switch_tests.py
>
> Modified: trunk/subversion/libsvn_ra_neon/commit.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_ra_neon/commit.c?pathrev=37745&r1=37744&r2=37745
> ===
> ===
> ===
> =====================================================================
> --- trunk/subversion/libsvn_ra_neon/commit.c Fri May 15 11:02:12
> 2009 (r37744)
> +++ trunk/subversion/libsvn_ra_neon/commit.c Fri May 15 12:26:42
> 2009 (r37745)
> @@ -632,10 +632,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: trunk/subversion/tests/cmdline/switch_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/switch_tests.py?pathrev=37745&r1=37744&r2=37745
> ===
> ===
> ===
> =====================================================================
> --- trunk/subversion/tests/cmdline/switch_tests.py Fri May 15
> 11:02:12 2009 (r37744)
> +++ trunk/subversion/tests/cmdline/switch_tests.py Fri May 15
> 12:26:42 2009 (r37745)
> @@ -1131,34 +1131,6 @@ def relocate_and_propset(sbox):
> # Make a propchange on A/D
> svntest.main.run_svn(None, 'ps', 'foo', 'bar', D_path)
>
> - # This test is failing over Neon, which differs in the approach it
> - # takes versus Serf. Here's a Neon trace:
> - #
> - # "MKACTIVITY /svn-test-work/repositories/
> switch_tests-19.other/!svn/act/ACTIVITYID HTTP/1.1" 201 267
> - # "PROPFIND /svn-test-work/repositories/switch_tests-19.other/A/
> D HTTP/1.1" 207 762
> - # "PROPFIND /svn-test-work/repositories/switch_tests-19.other/!
> svn/vcc/default HTTP/1.1" 207 478
> - # "CHECKOUT /svn-test-work/repositories/switch_tests-19.other/!
> svn/bln/2 HTTP/1.1" 201 281
> - # "PROPPATCH /svn-test-work/repositories/switch_tests-19.other/!
> svn/wbl/ACTIVITYID/2 HTTP/1.1" 207 500
> - # "PROPFIND /svn-test-work/repositories/switch_tests-19.other/A/
> D HTTP/1.1" 207 470
> - # "CHECKOUT /svn-test-work/repositories/switch_tests-19.other/!
> svn/ver/2/A/D HTTP/1.1" 201 283
> - # "PROPPATCH /svn-test-work/repositories/switch_tests-19.other/!
> svn/wrk/ACTIVITYID/A/D HTTP/1.1" 207 502
> - # "MERGE /svn-test-work/repositories/switch_tests-19.other/A/D
> HTTP/1.1" 200 858
> - # "DELETE /svn-test-work/repositories/switch_tests-19.other/!
> svn/act/ACTIVITYID HTTP/1.1" 204 -
> - #
> - # Notice the PROPPATCH that succeeds instead of failing.
> - #
> - # Here's the same in Serf:
> - #
> - # "MKACTIVITY /svn-test-work/repositories/
> switch_tests-19.other/!svn/act/ACTIVITYID HTTP/1.1" 201 267
> - # "PROPFIND /svn-test-work/repositories/switch_tests-19.other/A/
> D HTTP/1.1" 207 762
> - # "PROPFIND /svn-test-work/repositories/switch_tests-19.other/!
> svn/vcc/default HTTP/1.1" 207 478
> - # "PROPFIND /svn-test-work/repositories/switch_tests-19.other/A/
> D HTTP/1.1" 207 470
> - # "CHECKOUT /svn-test-work/repositories/switch_tests-19.other/!
> svn/bln/2 HTTP/1.1" 201 281
> - # "PROPPATCH /svn-test-work/repositories/switch_tests-19.other/!
> svn/wbl/ACTIVITYID/2 HTTP/1.1" 207 500
> - # "CHECKOUT /svn-test-work/repositories/switch_tests-19.other/!
> svn/ver/2/A/D HTTP/1.1" 201 283
> - # "PROPPATCH /svn-test-work/repositories/switch_tests-19.other/!
> svn/wrk/ACTIVITYID/A/D HTTP/1.1" 409 222
> - # "DELETE /svn-test-work/repositories/switch_tests-19.other/!
> svn/act/ACTIVITYID HTTP/1.1" 204 -
> -
> # Commit and *expect* a repository Merge failure:
> svntest.actions.run_and_verify_commit(wc_dir,
> None,
> @@ -2559,7 +2531,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_neon),
> + relocate_and_propset,
> forced_switch,
> forced_switch_failures,
> switch_scheduled_add,
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2273832
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2274429