You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/01/15 09:02:44 UTC

svn commit: r1651963 - /subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c

Author: rhuijben
Date: Thu Jan 15 08:02:44 2015
New Revision: 1651963

URL: http://svn.apache.org/r1651963
Log:
Add new test for issue
Found by: Joshua Oreman <oremanj{_AT_}gmail.com>

* subversion/tests/libsvn_wc/op-depth-test.c
  (nested_move_delete): New function.
  (test_funcs): Add nested_move_delete as 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=1651963&r1=1651962&r2=1651963&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Thu Jan 15 08:02:44 2015
@@ -9733,6 +9733,25 @@ break_move_in_delete(const svn_test_opts
 }
 
 
+static svn_error_t *
+nested_move_delete(const svn_test_opts_t *opts, apr_pool_t *pool)
+{
+  svn_test__sandbox_t b;
+
+  SVN_ERR(svn_test__sandbox_create(&b, "nested_move_delete", opts, pool));
+
+  SVN_ERR(sbox_add_and_commit_greek_tree(&b));
+
+  SVN_ERR(sbox_wc_mkdir(&b, "A/Z"));
+  SVN_ERR(sbox_wc_move(&b, "A/B/lambda", "A/Z/lambda"));
+
+  SVN_ERR(sbox_wc_delete(&b, "A/B"));
+
+  SVN_ERR(sbox_wc_move(&b, "A", "A_moved"));
+
+  return SVN_NO_ERROR;
+}
+
 /* ---------------------------------------------------------------------- */
 /* The list of test functions */
 
@@ -9926,6 +9945,8 @@ static struct svn_test_descriptor_t test
                        "repo_wc_copy"),
     SVN_TEST_OPTS_XFAIL(break_move_in_delete,
                        "break move in delete (issue 4491)"),
+    SVN_TEST_OPTS_XFAIL(nested_move_delete,
+                       "nested move delete"),
     SVN_TEST_NULL
   };