You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/04/07 16:34:54 UTC
svn commit: r1089892 - in /subversion/trunk/subversion: libsvn_wc/wc_db.c
tests/libsvn_wc/op-depth-test.c
Author: rhuijben
Date: Thu Apr 7 14:34:54 2011
New Revision: 1089892
URL: http://svn.apache.org/viewvc?rev=1089892&view=rev
Log:
Fix an additional op_root introduction issue identified by philip in
r1089877.
* subversion/libsvn_wc/wc_db.c
(db_op_copy): Don't just start a new op-depth for excluded, deleted and
not-present nodes, when we can leave that value at the parent op-depth.
* subversion/tests/libsvn_wc/op-depth-test.c
(test_list): Remove test_mixed_rev_copy's XFAIL.
Found by: philip
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1089892&r1=1089891&r2=1089892&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu Apr 7 14:34:54 2011
@@ -2501,10 +2501,17 @@ db_op_copy(svn_wc__db_wcroot_t *src_wcro
break;
case svn_wc__db_status_deleted:
case svn_wc__db_status_not_present:
- dst_status = svn_wc__db_status_not_present;
- break;
case svn_wc__db_status_excluded:
- dst_status = svn_wc__db_status_excluded;
+ /* These presence values should not create a new op depth */
+ if (dst_np_op_depth > 0)
+ {
+ dst_op_depth = dst_np_op_depth;
+ dst_np_op_depth = -1;
+ }
+ if (status == svn_wc__db_status_excluded)
+ dst_status = svn_wc__db_status_excluded;
+ else
+ dst_status = svn_wc__db_status_not_present;
break;
case svn_wc__db_status_absent:
return svn_error_createf(SVN_ERR_AUTHZ_UNREADABLE, NULL,
Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1089892&r1=1089891&r2=1089892&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Thu Apr 7 14:34:54 2011
@@ -2788,7 +2788,7 @@ struct svn_test_descriptor_t test_funcs[
"test_temp_op_make_copy"),
SVN_TEST_OPTS_PASS(test_wc_move,
"test_wc_move"),
- SVN_TEST_OPTS_XFAIL(test_mixed_rev_copy,
+ SVN_TEST_OPTS_PASS(test_mixed_rev_copy,
"test_mixed_rev_copy"),
SVN_TEST_OPTS_PASS(test_delete_of_replace,
"test_delete_of_replace"),