You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/09/19 23:48:12 UTC
svn commit: r1387787 - in /subversion/trunk/subversion: libsvn_wc/entries.c
tests/cmdline/authz_tests.py
Author: stsp
Date: Wed Sep 19 21:48:12 2012
New Revision: 1387787
URL: http://svn.apache.org/viewvc?rev=1387787&view=rev
Log:
Follow-up to r1387742, make authz test 24 pass again.
* subversion/libsvn_wc/entries.c
(insert_node): Don't insert "absent" presence into the DB, use
"server-excluded". This fixes authz test 24, which upgrades a
1.6 working copy to format 30.
* subversion/tests/cmdline/authz_tests.py
(upgrade_absent): Remove Xfail marker.
Modified:
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion/tests/cmdline/authz_tests.py
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1387787&r1=1387786&r2=1387787&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Wed Sep 19 21:48:12 2012
@@ -1459,7 +1459,7 @@ insert_node(svn_sqlite__db_t *sdb,
else if (node->presence == svn_wc__db_status_excluded)
SVN_ERR(svn_sqlite__bind_text(stmt, 8, "excluded"));
else if (node->presence == svn_wc__db_status_server_excluded)
- SVN_ERR(svn_sqlite__bind_text(stmt, 8, "absent"));
+ SVN_ERR(svn_sqlite__bind_text(stmt, 8, "server-excluded"));
if (node->kind == svn_node_none)
SVN_ERR(svn_sqlite__bind_text(stmt, 10, "unknown"));
Modified: subversion/trunk/subversion/tests/cmdline/authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/authz_tests.py?rev=1387787&r1=1387786&r2=1387787&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/authz_tests.py Wed Sep 19 21:48:12 2012
@@ -1364,7 +1364,6 @@ def wc_commit_error_handling(sbox):
@Skip(svntest.main.is_ra_type_file)
-@XFail() # broken by wc format 30
def upgrade_absent(sbox):
"upgrade absent nodes to server-excluded"