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 2014/04/16 11:40:52 UTC
svn commit: r1587842 -
/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
Author: philip
Date: Wed Apr 16 09:40:52 2014
New Revision: 1587842
URL: http://svn.apache.org/r1587842
Log:
* subversion/tests/libsvn_wc/op-depth-test.c
(break_move_in_delete): Move a deeper path X/Y/Z instead of X/Y, add
expected state when SEGV is resolved. Test is still XFAIL.
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=1587842&r1=1587841&r2=1587842&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Wed Apr 16 09:40:52 2014
@@ -9654,23 +9654,26 @@ break_move_in_delete(const svn_test_opts
SVN_ERR(sbox_wc_mkdir(&b, "A/B"));
SVN_ERR(sbox_wc_mkdir(&b, "X"));
SVN_ERR(sbox_wc_mkdir(&b, "X/Y"));
+ SVN_ERR(sbox_wc_mkdir(&b, "X/Y/Z"));
SVN_ERR(sbox_wc_commit(&b, ""));
- SVN_ERR(sbox_wc_propset(&b, "key", "value", "X/Y"));
+ SVN_ERR(sbox_wc_propset(&b, "key", "value", "X/Y/Z"));
SVN_ERR(sbox_wc_commit(&b, ""));
SVN_ERR(sbox_wc_update(&b, "", 1));
- SVN_ERR(sbox_wc_move(&b, "X/Y", "A/Y"));
+ SVN_ERR(sbox_wc_move(&b, "X/Y/Z", "A/Z"));
SVN_ERR(sbox_wc_delete(&b, "X"));
{
nodes_row_t nodes[] = {
- {0, "", "normal", 1, ""},
- {0, "A", "normal", 1, "A"},
- {0, "A/B", "normal", 1, "A/B"},
- {0, "X", "normal", 1, "X"},
- {0, "X/Y", "normal", 1, "X/Y"},
- {1, "X", "base-deleted", NO_COPY_FROM},
- {1, "X/Y", "base-deleted", NO_COPY_FROM, "A/Y"},
- {2, "A/Y", "normal", 1, "X/Y", MOVED_HERE},
+ {0, "", "normal", 1, ""},
+ {0, "A", "normal", 1, "A"},
+ {0, "A/B", "normal", 1, "A/B"},
+ {0, "X", "normal", 1, "X"},
+ {0, "X/Y", "normal", 1, "X/Y"},
+ {0, "X/Y/Z", "normal", 1, "X/Y/Z"},
+ {1, "X", "base-deleted", NO_COPY_FROM},
+ {1, "X/Y", "base-deleted", NO_COPY_FROM},
+ {1, "X/Y/Z", "base-deleted", NO_COPY_FROM, "A/Z"},
+ {2, "A/Z", "normal", 1, "X/Y/Z", MOVED_HERE},
{0}
};
SVN_ERR(check_db_rows(&b, "", nodes));
@@ -9679,14 +9682,16 @@ break_move_in_delete(const svn_test_opts
SVN_ERR(sbox_wc_update(&b, "", 2));
{
nodes_row_t nodes[] = {
- {0, "", "normal", 2, ""},
- {0, "A", "normal", 2, "A"},
- {0, "A/B", "normal", 2, "A/B"},
- {0, "X", "normal", 2, "X"},
- {0, "X/Y", "normal", 2, "X/Y"},
- {1, "X", "base-deleted", NO_COPY_FROM},
- {1, "X/Y", "base-deleted", NO_COPY_FROM, "A/Y"},
- {2, "A/Y", "normal", 1, "X/Y", MOVED_HERE},
+ {0, "", "normal", 2, ""},
+ {0, "A", "normal", 2, "A"},
+ {0, "A/B", "normal", 2, "A/B"},
+ {0, "X", "normal", 2, "X"},
+ {0, "X/Y", "normal", 2, "X/Y"},
+ {0, "X/Y/Z", "normal", 2, "X/Y/Z"},
+ {1, "X", "base-deleted", NO_COPY_FROM},
+ {1, "X/Y", "base-deleted", NO_COPY_FROM},
+ {1, "X/Y/Z", "base-deleted", NO_COPY_FROM, "A/Z"},
+ {2, "A/Z", "normal", 1, "X/Y/Z", MOVED_HERE},
{0}
};
conflict_info_t conflicts1[] = {
@@ -9694,7 +9699,7 @@ break_move_in_delete(const svn_test_opts
{0}
};
conflict_info_t conflicts2[] = {
- {"X/Y", FALSE, FALSE, TRUE},
+ {"X/Y/Z", FALSE, FALSE, TRUE},
{0}
};
SVN_ERR(check_db_rows(&b, "", nodes));
@@ -9704,7 +9709,24 @@ break_move_in_delete(const svn_test_opts
SVN_ERR(check_db_rows(&b, "", nodes));
SVN_ERR(check_db_conflicts(&b, "", conflicts2));
}
- SVN_ERR(sbox_wc_resolved(&b, "X/Y"));
+
+ SVN_ERR(sbox_wc_resolved(&b, "X/Y/Z"));
+ {
+ nodes_row_t nodes[] = {
+ {0, "", "normal", 2, ""},
+ {0, "A", "normal", 2, "A"},
+ {0, "A/B", "normal", 2, "A/B"},
+ {0, "X", "normal", 2, "X"},
+ {0, "X/Y", "normal", 2, "X/Y"},
+ {0, "X/Y/Z", "normal", 2, "X/Y/Z"},
+ {1, "X", "base-deleted", NO_COPY_FROM},
+ {1, "X/Y", "base-deleted", NO_COPY_FROM},
+ {1, "X/Y/Z", "base-deleted", NO_COPY_FROM},
+ {2, "A/Z", "normal", 1, "X/Y/Z"},
+ {0}
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
return SVN_NO_ERROR;
}