subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1455946 - /subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
Date Wed, 13 Mar 2013 14:07:55 GMT
Author: rhuijben
Date: Wed Mar 13 14:07:55 2013
New Revision: 1455946

URL: http://svn.apache.org/r1455946
Log:
* subversion/tests/libsvn_wc/op-depth-test.c
  (move_depth_expand): Document/verify the state before update/resolve.

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=1455946&r1=1455945&r2=1455946&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Wed Mar 13 14:07:55 2013
@@ -7697,6 +7697,29 @@ move_depth_expand(const svn_test_opts_t 
   SVN_ERR(sbox_wc_mkdir(&b, "C/A/A")); /* Local addition obstruction */
   SVN_ERR(sbox_wc_copy(&b, "C/A", "C/B")); /* Copied obstruction */
 
+  {
+    nodes_row_t nodes[] = {
+      {0, "",       "normal",       1, "" },
+
+      {0, "A",      "normal",       1, "A" },
+      {1, "A",      "base-deleted", NO_COPY_FROM, "C" },
+      {0, "A/A",    "normal",       1, "A/A" },
+      {1, "A/A",    "base-deleted", NO_COPY_FROM },
+      {0, "A/B",    "not-present",  0, "A/B" },
+
+      {1, "C",      "normal",       1, "A", MOVED_HERE },
+
+      {1, "C/A",    "normal",       1, "A/A", MOVED_HERE },
+      {3, "C/A/A",  "normal",       NO_COPY_FROM },
+
+      {1, "C/B",    "not-present",  0, "A/B", MOVED_HERE},
+      {2, "C/B",    "normal",       1, "A/A" },
+      {3, "C/B/A",  "normal",       NO_COPY_FROM },
+      {0}
+    };
+    SVN_ERR(check_db_rows(&b, "", nodes));
+  }
+
   SVN_ERR(sbox_wc_update_depth(&b, "", 1, svn_depth_infinity, TRUE));
 
   /* This used to cause a segfault. Now it asserts in a different place */



Mime
View raw message