subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1413405 - /subversion/trunk/subversion/tests/libsvn_wc/utils.c
Date Sun, 25 Nov 2012 20:23:49 GMT
Author: stefan2
Date: Sun Nov 25 20:23:49 2012
New Revision: 1413405

URL: http://svn.apache.org/viewvc?rev=1413405&view=rev
Log:
Fix deprecation warnings.

* subversion/tests/libsvn_wc/utils.c
  (sbox_wc_commit,
   sbox_wc_update,
   sbox_wc_resolve,
   sbox_wc_move,
   sbox_wc_propset): upgrade to svn_client_create_context2
  (sbox_wc_resolved): same plus update to svn_client_resolve

Modified:
    subversion/trunk/subversion/tests/libsvn_wc/utils.c

Modified: subversion/trunk/subversion/tests/libsvn_wc/utils.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/utils.c?rev=1413405&r1=1413404&r2=1413405&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/utils.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/utils.c Sun Nov 25 20:23:49 2012
@@ -293,7 +293,7 @@ sbox_wc_commit(svn_test__sandbox_t *b, c
                                                sizeof(const char *));
 
   APR_ARRAY_PUSH(targets, const char *) = sbox_wc_path(b, path);
-  SVN_ERR(svn_client_create_context(&ctx, b->pool));
+  SVN_ERR(svn_client_create_context2(&ctx, NULL, b->pool));
   return svn_client_commit5(targets, svn_depth_infinity,
                             FALSE, FALSE, TRUE, /* keep locks/cl's/use_ops*/
                             NULL, NULL, NULL, NULL, ctx, b->pool);
@@ -312,7 +312,7 @@ sbox_wc_update(svn_test__sandbox_t *b, c
   revision.value.number = revnum;
 
   APR_ARRAY_PUSH(paths, const char *) = sbox_wc_path(b, path);
-  SVN_ERR(svn_client_create_context(&ctx, b->pool));
+  SVN_ERR(svn_client_create_context2(&ctx, NULL, b->pool));
   return svn_client_update4(&result_revs, paths, &revision, svn_depth_infinity,
                             TRUE, FALSE, FALSE, FALSE, FALSE,
                             ctx, b->pool);
@@ -323,8 +323,9 @@ sbox_wc_resolved(svn_test__sandbox_t *b,
 {
   svn_client_ctx_t *ctx;
 
-  SVN_ERR(svn_client_create_context(&ctx, b->pool));
-  return svn_client_resolved(sbox_wc_path(b, path), TRUE, ctx, b->pool);
+  SVN_ERR(svn_client_create_context2(&ctx, NULL, b->pool));
+  return svn_client_resolve(sbox_wc_path(b, path), svn_depth_infinity,
+                            svn_wc_conflict_choose_merged, ctx, b->pool);
 }
 
 svn_error_t *
@@ -332,7 +333,7 @@ sbox_wc_resolve(svn_test__sandbox_t *b, 
 {
   svn_client_ctx_t *ctx;
 
-  SVN_ERR(svn_client_create_context(&ctx, b->pool));
+  SVN_ERR(svn_client_create_context2(&ctx, NULL, b->pool));
   return svn_client_resolve(sbox_wc_path(b, path), svn_depth_infinity,
                             svn_wc_conflict_choose_mine_conflict,
                             ctx, b->pool);
@@ -345,7 +346,7 @@ sbox_wc_move(svn_test__sandbox_t *b, con
   apr_array_header_t *paths = apr_array_make(b->pool, 1,
                                              sizeof(const char *));
 
-  SVN_ERR(svn_client_create_context(&ctx, b->pool));
+  SVN_ERR(svn_client_create_context2(&ctx, NULL, b->pool));
   APR_ARRAY_PUSH(paths, const char *) = sbox_wc_path(b, src);
   return svn_client_move6(paths, sbox_wc_path(b, dst),
                           FALSE, FALSE, NULL, NULL, NULL, ctx, b->pool);
@@ -361,7 +362,7 @@ sbox_wc_propset(svn_test__sandbox_t *b,
   apr_array_header_t *paths = apr_array_make(b->pool, 1,
                                              sizeof(const char *));
 
-  SVN_ERR(svn_client_create_context(&ctx, b->pool));
+  SVN_ERR(svn_client_create_context2(&ctx, NULL, b->pool));
   APR_ARRAY_PUSH(paths, const char *) = sbox_wc_path(b, path);
   return svn_client_propset_local(name, svn_string_create(value, b->pool),
                                   paths, svn_depth_empty, TRUE, NULL, ctx,



Mime
View raw message