Author: stsp
Date: Thu Apr 12 18:20:39 2012
New Revision: 1325424
URL: http://svn.apache.org/viewvc?rev=1325424&view=rev
Log:
* subversion/tests/libsvn_wc/op-depth-test.c
(test_shadowed_update): The change made in r1325407 allows this test to
PASS because moving a copy now behaves as expected.
(test_funcs): Remove XFAIL marker from test_shadowed_update().
Modified:
subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
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=1325424&r1=1325423&r2=1325424&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 12
18:20:39 2012
@@ -3169,9 +3169,7 @@ test_shadowed_update(const svn_test_opts
SVN_ERR(wc_update(&b, "", 2));
SVN_ERR(wc_copy(&b, "A", "A_tmp"));
SVN_ERR(wc_update(&b, "", 1));
- SVN_ERR(wc_move(&b, "A_tmp", "A")); /* ### XFAIL: sets moved-here on
- A but A_tmp is removed and so
- does not have moved-to. */
+ SVN_ERR(wc_move(&b, "A_tmp", "A"));
SVN_ERR(wc_mkdir(&b, "K"));
SVN_ERR(wc_mkdir(&b, "K/L"));
@@ -4626,7 +4624,7 @@ struct svn_test_descriptor_t test_funcs[
"test_op_delete"),
SVN_TEST_OPTS_PASS(test_child_replace_with_same_origin,
"test_child_replace_with_same"),
- SVN_TEST_OPTS_XFAIL(test_shadowed_update,
+ SVN_TEST_OPTS_PASS(test_shadowed_update,
"test_shadowed_update"),
SVN_TEST_OPTS_PASS(test_copy_of_deleted,
"test_copy_of_deleted (issue #3873)"),
