Author: philip
Date: Tue May 10 14:57:53 2011
New Revision: 1101492
URL: http://svn.apache.org/viewvc?rev=1101492&view=rev
Log:
* subversion/tests/libsvn_wc/op-depth-test.c
(test_op_delete): Test adding layer above layer with deleted children.
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=1101492&r1=1101491&r2=1101492&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Tue May 10
14:57:53 2011
@@ -2999,6 +2999,36 @@ test_op_delete(const svn_test_opts_t *op
SVN_ERR(do_delete(&b, "A", before, after, before_actual, after_actual));
}
+ {
+ nodes_row_t before[] = {
+ { 0, "", "normal", 5, "" },
+ { 0, "A", "normal", 5, "A" },
+ { 0, "A/B", "normal", 5, "A/B" },
+ { 0, "A/B/f", "normal", 5, "A/B/f" },
+ { 0, "A/B/g", "normal", 5, "A/B/g" },
+ { 1, "A", "normal", 4, "A" },
+ { 1, "A/B", "normal", 4, "A/B" },
+ { 1, "A/B/f", "normal", 4, "A/B/f" },
+ { 1, "A/B/g", "base-deleted", NO_COPY_FROM},
+ { 0 }
+ };
+ nodes_row_t after[] = {
+ { 0, "", "normal", 5, "" },
+ { 0, "A", "normal", 5, "A" },
+ { 0, "A/B", "normal", 5, "A/B" },
+ { 0, "A/B/f", "normal", 5, "A/B/f" },
+ { 0, "A/B/g", "normal", 5, "A/B/g" },
+ { 1, "A", "normal", 4, "A" },
+ { 1, "A/B", "normal", 4, "A/B" },
+ { 1, "A/B/f", "normal", 4, "A/B/f" },
+ { 1, "A/B/g", "base-deleted", NO_COPY_FROM},
+ { 2, "A/B", "base-deleted", NO_COPY_FROM},
+ { 2, "A/B/f", "base-deleted", NO_COPY_FROM},
+ { 0 }
+ };
+ SVN_ERR(do_delete(&b, "A/B", before, after, NULL, NULL));
+ }
+
return SVN_NO_ERROR;
}
