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 2010/11/13 16:01:53 UTC
svn commit: r1034775 -
/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
Author: philip
Date: Sat Nov 13 15:01:53 2010
New Revision: 1034775
URL: http://svn.apache.org/viewvc?rev=1034775&view=rev
Log:
* subversion/tests/libsvn_wc/op-depth-test.c
(insert_dirs, base_dir_insert_remove): Remove trailing whitespace.
(test_base_dir_insert_remove): Add some cases with higher op_depth.
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=1034775&r1=1034774&r2=1034775&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Sat Nov 13 15:01:53 2010
@@ -1177,7 +1177,7 @@ insert_dirs(wc_baton_t *b,
NULL,
};
- SVN_ERR(svn_sqlite__open(&sdb, dbpath, svn_sqlite__mode_readwrite,
+ SVN_ERR(svn_sqlite__open(&sdb, dbpath, svn_sqlite__mode_readwrite,
statements, 0, NULL,
b->pool, b->pool));
@@ -1237,7 +1237,7 @@ base_dir_insert_remove(wc_baton_t *b,
for (i = 0; i < num_added; ++i)
after[num_before+i] = added[i];
after[num_before+num_added].local_relpath = NULL;
-
+
SVN_ERR(check_db_rows(b, "", after));
SVN_ERR(svn_wc__db_base_remove(b->wc_ctx->db, dir_abspath, b->pool));
@@ -1476,6 +1476,74 @@ test_base_dir_insert_remove(const svn_te
};
SVN_ERR(base_dir_insert_remove(&b, "A/B/C", 2, before, added));
}
+ {
+ /* / norm /
+ A norm norm A norm norm
+ A/B norm not-p norm A/B norm not-p norm
+ A/B/C norm A/B/C norm b-del norm
+ */
+ nodes_row_t before[] = {
+ { 0, "", "normal", 2, "" },
+ { 0, "A", "normal", 2, "A" },
+ { 0, "A/B", "normal", 2, "A/B" },
+ { 1, "A", "normal", 1, "X" },
+ { 1, "A/B", "not-present", NO_COPY_FROM },
+ { 2, "A/B", "normal", 1, "Y" },
+ { 3, "A/B/C", "normal", NO_COPY_FROM },
+ { 0 }
+ };
+ nodes_row_t added[] = {
+ { 0, "A/B/C", "normal", 2, "A/B/C" },
+ { 1, "A/B/C", "base-deleted", NO_COPY_FROM },
+ { 0 }
+ };
+ SVN_ERR(base_dir_insert_remove(&b, "A/B/C", 2, before, added));
+ }
+ {
+ /* / norm / norm
+ A norm A norm
+ A/B norm A/B norm
+ A/B/C norm - - norm A/B/C norm - - norm
+ A/B/C/D norm - - b-del
+ */
+ nodes_row_t before[] = {
+ { 0, "", "normal", 2, "" },
+ { 0, "A", "normal", 2, "A" },
+ { 0, "A/B", "normal", 2, "A/B" },
+ { 0, "A/B/C", "normal", 2, "A/B/C" },
+ { 3, "A/B/C", "normal", NO_COPY_FROM },
+ { 0 }
+ };
+ nodes_row_t added[] = {
+ { 0, "A/B/C/D", "normal", 2, "A/B/C/D" },
+ { 3, "A/B/C/D", "base-deleted", NO_COPY_FROM },
+ { 0 }
+ };
+ SVN_ERR(base_dir_insert_remove(&b, "A/B/C/D", 2, before, added));
+ }
+ {
+ /* / norm / norm
+ A norm A norm
+ A/B norm A/B norm
+ A/B/C norm - - norm A/B/C norm - - norm
+ A/B/C/D norm A/B/C/D norm - - b-del norm
+ */
+ nodes_row_t before[] = {
+ { 0, "", "normal", 2, "" },
+ { 0, "A", "normal", 2, "A" },
+ { 0, "A/B", "normal", 2, "A/B" },
+ { 0, "A/B/C", "normal", 2, "A/B/C" },
+ { 3, "A/B/C", "normal", NO_COPY_FROM },
+ { 4, "A/B/C/D", "normal", NO_COPY_FROM },
+ { 0 }
+ };
+ nodes_row_t added[] = {
+ { 0, "A/B/C/D", "normal", 2, "A/B/C/D" },
+ { 3, "A/B/C/D", "base-deleted", NO_COPY_FROM },
+ { 0 }
+ };
+ SVN_ERR(base_dir_insert_remove(&b, "A/B/C/D", 2, before, added));
+ }
return SVN_NO_ERROR;
}