Functions | |
svn_error_t * | svn_client_resolved (const char *path, svn_boolean_t recursive, svn_client_ctx_t *ctx, apr_pool_t *pool) |
Similar to svn_client_resolve(), but without automatic conflict resolution support. | |
svn_error_t * | svn_client_resolve (const char *path, svn_depth_t depth, svn_wc_conflict_choice_t conflict_choice, svn_client_ctx_t *ctx, apr_pool_t *pool) |
Perform automatic conflict resolution on a working copy path. |
|
Perform automatic conflict resolution on a working copy path.
If depth is
If conflict_choice is
( If path is not in a state of conflict to begin with, do nothing. If path's conflict state is removed and ctx->notify_func2 is non-NULL, call ctx->notify_func2 with ctx->notify_baton2 and path.
|
|
Similar to svn_client_resolve(), but without automatic conflict resolution support.
|