You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gs...@apache.org on 2011/02/23 22:37:47 UTC
svn commit: r1073955 - /subversion/trunk/subversion/libsvn_client/resolved.c
Author: gstein
Date: Wed Feb 23 21:37:47 2011
New Revision: 1073955
URL: http://svn.apache.org/viewvc?rev=1073955&view=rev
Log:
Small change lying around...
* subversion/libsvn_client/resolved.c:
(svn_client_resolve): clarify some params
Modified:
subversion/trunk/subversion/libsvn_client/resolved.c
Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1073955&r1=1073954&r2=1073955&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Wed Feb 23 21:37:47 2011
@@ -56,7 +56,10 @@ svn_client_resolve(const char *path,
SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
SVN_ERR(svn_wc_resolved_conflict5(ctx->wc_ctx, local_abspath,
- depth, TRUE, "", TRUE,
+ depth,
+ TRUE /* resolve_text */,
+ "" /* resolve_prop (ALL props) */,
+ TRUE /* resolve_tree */,
conflict_choice,
ctx->cancel_func, ctx->cancel_baton,
ctx->notify_func2, ctx->notify_baton2,