You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2012/03/14 12:06:07 UTC
svn commit: r1300501 -
/subversion/branches/multi-layer-moves/subversion/tests/libsvn_wc/op-depth-test.c
Author: philip
Date: Wed Mar 14 11:06:07 2012
New Revision: 1300501
URL: http://svn.apache.org/viewvc?rev=1300501&view=rev
Log:
On multi-layer-move branch, fix a test.
* subversion/tests/libsvn_wc/op-depth-test.c
(revert_nested_moves): Adjust expectations, add an extra case.
Modified:
subversion/branches/multi-layer-moves/subversion/tests/libsvn_wc/op-depth-test.c
Modified: subversion/branches/multi-layer-moves/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/tests/libsvn_wc/op-depth-test.c?rev=1300501&r1=1300500&r2=1300501&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/branches/multi-layer-moves/subversion/tests/libsvn_wc/op-depth-test.c Wed Mar 14 11:06:07 2012
@@ -4267,10 +4267,10 @@ revert_nested_move(const svn_test_opts_t
svn_test__sandbox_t b;
nodes_row_t nodes_A_moved[] = {
{0, "", "normal", 1, ""},
- {0, "A", "normal", 1, "A", FALSE, "A2"},
+ {0, "A", "normal", 1, "A"},
{0, "A/B", "normal", 1, "A/B"},
{0, "A/B/C", "normal", 1, "A/B/C"},
- {1, "A", "base-deleted", NO_COPY_FROM},
+ {1, "A", "base-deleted", NO_COPY_FROM, "A2"},
{1, "A/B", "base-deleted", NO_COPY_FROM},
{1, "A/B/C", "base-deleted", NO_COPY_FROM},
{1, "A2", "normal", 1, "A", MOVED_HERE},
@@ -4280,16 +4280,16 @@ revert_nested_move(const svn_test_opts_t
};
nodes_row_t nodes_AB_moved[] = {
{0, "", "normal", 1, ""},
- {0, "A", "normal", 1, "A", FALSE, "A2"},
- {0, "A/B", "normal", 1, "A/B", FALSE, "A2/B2"},
+ {0, "A", "normal", 1, "A"},
+ {0, "A/B", "normal", 1, "A/B"},
{0, "A/B/C", "normal", 1, "A/B/C"},
- {1, "A", "base-deleted", NO_COPY_FROM},
+ {1, "A", "base-deleted", NO_COPY_FROM, "A2"},
{1, "A/B", "base-deleted", NO_COPY_FROM},
{1, "A/B/C", "base-deleted", NO_COPY_FROM},
{1, "A2", "normal", 1, "A", MOVED_HERE},
{1, "A2/B", "normal", 1, "A/B", MOVED_HERE},
{1, "A2/B/C", "normal", 1, "A/B/C", MOVED_HERE},
- {2, "A2/B", "base-deleted", NO_COPY_FROM},
+ {2, "A2/B", "base-deleted", NO_COPY_FROM, "A2/B2"},
{2, "A2/B/C", "base-deleted", NO_COPY_FROM},
{2, "A2/B2", "normal", 1, "A/B", MOVED_HERE},
{2, "A2/B2/C", "normal", 1, "A/B/C", MOVED_HERE},
@@ -4297,20 +4297,20 @@ revert_nested_move(const svn_test_opts_t
};
nodes_row_t nodes_ABC_moved[] = {
{0, "", "normal", 1, ""},
- {0, "A", "normal", 1, "A", FALSE, "A2"},
- {0, "A/B", "normal", 1, "A/B", FALSE, "A2/B2"},
- {0, "A/B/C", "normal", 1, "A/B/C", FALSE, "A2/B2/C2"},
- {1, "A", "base-deleted", NO_COPY_FROM},
+ {0, "A", "normal", 1, "A"},
+ {0, "A/B", "normal", 1, "A/B"},
+ {0, "A/B/C", "normal", 1, "A/B/C"},
+ {1, "A", "base-deleted", NO_COPY_FROM, "A2"},
{1, "A/B", "base-deleted", NO_COPY_FROM},
{1, "A/B/C", "base-deleted", NO_COPY_FROM},
{1, "A2", "normal", 1, "A", MOVED_HERE},
{1, "A2/B", "normal", 1, "A/B", MOVED_HERE},
{1, "A2/B/C", "normal", 1, "A/B/C", MOVED_HERE},
- {2, "A2/B", "base-deleted", NO_COPY_FROM},
+ {2, "A2/B", "base-deleted", NO_COPY_FROM, "A2/B2"},
{2, "A2/B/C", "base-deleted", NO_COPY_FROM},
{2, "A2/B2", "normal", 1, "A/B", MOVED_HERE},
{2, "A2/B2/C", "normal", 1, "A/B/C", MOVED_HERE},
- {3, "A2/B2/C", "base-deleted", NO_COPY_FROM},
+ {3, "A2/B2/C", "base-deleted", NO_COPY_FROM, "A2/B2/C2"},
{3, "A2/B2/C2", "normal", 1, "A/B/C", MOVED_HERE},
{0}
};
@@ -4348,6 +4348,13 @@ revert_nested_move(const svn_test_opts_t
SVN_ERR(wc_revert(&b, "A2/B2", svn_depth_infinity));
SVN_ERR(check_db_rows(&b, "", nodes_A_moved));
+ /* Check moves in reverse order */
+ SVN_ERR(wc_revert(&b, "", svn_depth_infinity));
+ SVN_ERR(wc_move(&b, "A/B/C", "A/B/C2"));
+ SVN_ERR(wc_move(&b, "A/B", "A/B2"));
+ SVN_ERR(wc_move(&b, "A", "A2"));
+ SVN_ERR(check_db_rows(&b, "", nodes_ABC_moved));
+
return SVN_NO_ERROR;
}