subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1089877 - /subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
Date Thu, 07 Apr 2011 13:37:33 GMT
Author: philip
Date: Thu Apr  7 13:37:32 2011
New Revision: 1089877

URL: http://svn.apache.org/viewvc?rev=1089877&view=rev
Log:
* subversion/tests/libsvn_wc/op-depth-test.c
  (test_mixed_rev_copy): Extend to cover not-present source.
  (test_list): Mark test_mixed_rev_copy 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=1089877&r1=1089876&r2=1089877&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Thu Apr  7 13:37:32 2011
@@ -1733,6 +1733,31 @@ test_mixed_rev_copy(const svn_test_opts_
     SVN_ERR(check_db_rows(&b, "X", rows));
   }
 
+  SVN_ERR(wc_delete(&b, "X"));
+  SVN_ERR(wc_update(&b, "A/B/C", 0));
+  {
+    nodes_row_t rows[] = {
+      { 0, "",      "normal",       0, "" },
+      { 0, "A",     "normal",       1, "A" },
+      { 0, "A/B",   "normal",       2, "A/B" },
+      { 0, "A/B/C", "not-present",  3, "A/B/C" },
+      { 0 }
+    };
+    SVN_ERR(check_db_rows(&b, "", rows));
+  }
+
+  SVN_ERR(wc_copy(&b, "A", "X"));
+  {
+    nodes_row_t rows[] = {
+      { 1, "X",     "normal",       1, "A" },
+      { 1, "X/B",   "not-present",  2, "A/B" },
+      { 2, "X/B",   "normal",       2, "A/B" },
+      { 2, "X/B/C", "not-present",  3, "A/B/C" },
+      { 0 }
+    };
+    SVN_ERR(check_db_rows(&b, "X", rows));
+  }
+
   return SVN_NO_ERROR;
 }
 
@@ -2763,8 +2788,8 @@ struct svn_test_descriptor_t test_funcs[
                        "test_temp_op_make_copy"),
     SVN_TEST_OPTS_PASS(test_wc_move,
                        "test_wc_move"),
-    SVN_TEST_OPTS_PASS(test_mixed_rev_copy,
-                       "test_mixed_rev_copy"),
+    SVN_TEST_OPTS_XFAIL(test_mixed_rev_copy,
+                        "test_mixed_rev_copy"),
     SVN_TEST_OPTS_PASS(test_delete_of_replace,
                        "test_delete_of_replace"),
     SVN_TEST_OPTS_PASS(test_del_replace_not_present,



Mime
View raw message