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 2013/10/28 20:09:14 UTC
svn commit: r1536488 -
/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
Author: rhuijben
Date: Mon Oct 28 19:09:14 2013
New Revision: 1536488
URL: http://svn.apache.org/r1536488
Log:
* subversion/tests/libsvn_wc/op-depth-test.c
(move_delete_intermediate): Following up on r1536464, fix assumptions.
(test_funcs): Remove XFail marker.
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=1536488&r1=1536487&r2=1536488&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Mon Oct 28 19:09:14 2013
@@ -8406,17 +8406,18 @@ move_delete_intermediate(const svn_test_
/* Let's delete A */
SVN_ERR(sbox_wc_delete(&b, "A"));
- /* AAA_1 should now be a copy, but AAA_2 and AAA_3 should still be moves,
- but now from the original location instead of from "A/A/A" */
+ /* AAA_1, AAA_2 and AAA_3 should still be moves after deleting A */
{
nodes_row_t nodes[] = {
{0, "", "normal", 0, ""},
- {1, "AAA_1", "normal", 1, "A/A/A",},
- {1, "AAA_1/A", "normal", 1, "A/A/A/A"},
+ {1, "AAA_1", "normal", 1, "A/A/A", MOVED_HERE},
+ {1, "AAA_1/A", "normal", 1, "A/A/A/A", MOVED_HERE},
+
{1, "AAA_2", "normal", 1, "B/A/A", MOVED_HERE},
{1, "AAA_2/A", "normal", 1, "B/A/A/A", MOVED_HERE},
+
{1, "AAA_3", "normal", 1, "C/A/A", MOVED_HERE},
{1, "AAA_3/A", "normal", 1, "C/A/A/A", MOVED_HERE},
@@ -8425,6 +8426,11 @@ move_delete_intermediate(const svn_test_
{0, "A/A/A", "normal", 1, "A/A/A"},
{0, "A/A/A/A", "normal", 1, "A/A/A/A"},
+ {1, "A", "base-deleted", NO_COPY_FROM},
+ {1, "A/A", "base-deleted", NO_COPY_FROM},
+ {1, "A/A/A", "base-deleted", NO_COPY_FROM, "AAA_1"},
+ {1, "A/A/A/A", "base-deleted", NO_COPY_FROM},
+
{0, "B", "normal", 1, "B"},
{0, "B/A", "normal", 1, "B/A"},
{0, "B/A/A", "normal", 1, "B/A/A"},
@@ -8906,7 +8912,7 @@ struct svn_test_descriptor_t test_funcs[
"copy mixed-rev with mods"),
SVN_TEST_OPTS_PASS(move_child_to_parent_revert,
"move child to parent and revert (issue 4436)"),
- SVN_TEST_OPTS_XFAIL(move_delete_intermediate,
+ SVN_TEST_OPTS_PASS(move_delete_intermediate,
"move more than once, delete intermediate"),
SVN_TEST_OPTS_XFAIL(move_revert_intermediate,
"move more than once, revert intermediate"),