You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2012/12/07 17:56:55 UTC
svn commit: r1418392 - /subversion/trunk/subversion/tests/libsvn_wc/utils.c
Author: julianfoad
Date: Fri Dec 7 16:56:54 2012
New Revision: 1418392
URL: http://svn.apache.org/viewvc?rev=1418392&view=rev
Log:
* subversion/tests/libsvn_wc/utils.c
(sbox_wc_resolved, sbox_wc_resolve): Use only libsvn_wc functions and
avoid libsvn_client, as this is libsvn_wc test and it's easy to do so.
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=1418392&r1=1418391&r2=1418392&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/utils.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/utils.c Fri Dec 7 16:56:54 2012
@@ -321,22 +321,24 @@ sbox_wc_update(svn_test__sandbox_t *b, c
svn_error_t *
sbox_wc_resolved(svn_test__sandbox_t *b, const char *path)
{
- svn_client_ctx_t *ctx;
-
- 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);
+ return sbox_wc_resolve(b, path, svn_wc_conflict_choose_merged);
}
svn_error_t *
sbox_wc_resolve(svn_test__sandbox_t *b, const char *path,
svn_wc_conflict_choice_t conflict_choice)
{
- svn_client_ctx_t *ctx;
-
- SVN_ERR(svn_client_create_context2(&ctx, NULL, b->pool));
- return svn_client_resolve(sbox_wc_path(b, path), svn_depth_infinity,
- conflict_choice, ctx, b->pool);
+ SVN_ERR(svn_wc__resolve_conflicts(b->wc_ctx, sbox_wc_path(b, path),
+ svn_depth_infinity,
+ TRUE /* resolve_text */,
+ "" /* resolve_prop (ALL props) */,
+ TRUE /* resolve_tree */,
+ conflict_choice,
+ NULL, NULL, /* conflict func */
+ NULL, NULL, /* cancellation */
+ NULL, NULL, /* notification */
+ b->pool));
+ return SVN_NO_ERROR;
}
svn_error_t *