svn commit: r1455887 - in /subversion/trunk/subversion/tests/libsvn_wc: op-depth-test.c utils.c

[rh...@apache.org]

Author: rhuijben
Date: Wed Mar 13 11:13:31 2013
New Revision: 1455887

URL: http://svn.apache.org/r1455887
Log:
Following up on r1455881, make sbox_wc_update_depth behave like it is supposed
to and fix the new test.

* subversion/tests/libsvn_wc/op-depth-test.c
  (move_depth_expand): Update caller.

* subversion/tests/libsvn_wc/utils.c
  (sbox_wc_update_depth): Pass the new sticky argument to svn_client_update4()
    instead of always passing true.

Modified:
    subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/trunk/subversion/tests/libsvn_wc/utils.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=1455887&r1=1455886&r2=1455887&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 11:13:31 2013
@@ -7687,8 +7687,8 @@ move_depth_expand(const svn_test_opts_t 
   SVN_ERR(sbox_wc_commit(&b, ""));
   SVN_ERR(sbox_wc_update(&b, "", 0));
 
-  SVN_ERR(sbox_wc_update_depth(&b, "", 1, svn_depth_immediates, FALSE));
-  SVN_ERR(sbox_wc_update_depth(&b, "A", 1, svn_depth_immediates, FALSE));
+  SVN_ERR(sbox_wc_update_depth(&b, "", 1, svn_depth_immediates, TRUE));
+  SVN_ERR(sbox_wc_update_depth(&b, "A", 1, svn_depth_immediates, TRUE));
 
   SVN_ERR(sbox_wc_move(&b, "A", "C"));
   SVN_ERR(sbox_wc_mkdir(&b, "C/A/A"));

Modified: subversion/trunk/subversion/tests/libsvn_wc/utils.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/utils.c?rev=1455887&r1=1455886&r2=1455887&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/utils.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/utils.c Wed Mar 13 11:13:31 2013
@@ -333,7 +333,7 @@ sbox_wc_update_depth(svn_test__sandbox_t
   SVN_ERR(svn_client_create_context2(&ctx, NULL, b->pool));
   ctx->wc_ctx = b->wc_ctx;
   return svn_client_update4(&result_revs, paths, &revision, depth,
-                            TRUE, FALSE, FALSE, FALSE, FALSE,
+                            sticky, FALSE, FALSE, FALSE, FALSE,
                             ctx, b->pool);
 }