Author: stsp
Date: Fri Feb 19 16:12:30 2016
New Revision: 1731267
URL: http://svn.apache.org/viewvc?rev=1731267&view=rev
Log:
* subversion/libsvn_client/resolved.c
(resolve_tree_conflict): Stop calling svn_wc__resolve_conflicts() to resolve
otherwise unhandled tree conflicts. Use svn_wc__del_tree_conflict() instead.
With this change, all tree conflicts are resolved independently of the legacy
conflict resolver implementation. Text and property conflicts still use it
but for now there is no reason to change that.
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=1731267&r1=1731266&r2=1731267&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Fri Feb 19 16:12:30
2016
@@ -884,20 +884,16 @@ resolve_tree_conflict(svn_client_conflic
}
else
{
- svn_wc_conflict_choice_t conflict_choice;
+ /* Resolve to current working copy state. */
+ err = svn_wc__del_tree_conflict(ctx->wc_ctx, local_abspath,
scratch_pool);
- conflict_choice =
- svn_client_conflict_option_id_to_wc_conflict_choice(option_id);
- err = svn_wc__resolve_conflicts(ctx->wc_ctx, local_abspath,
- svn_depth_empty,
- FALSE, FALSE, TRUE,
- conflict_choice,
- NULL, NULL,
- ctx->cancel_func,
- ctx->cancel_baton,
- ctx->notify_func2,
- ctx->notify_baton2,
- scratch_pool);
+ /* svn_wc__del_tree_conflict doesn't handle notification for us */
+ if (ctx->notify_func2)
+ ctx->notify_func2(ctx->notify_baton2,
+ svn_wc_create_notify(local_abspath,
+ svn_wc_notify_resolved,
+ scratch_pool),
+ scratch_pool);
}
err = svn_error_compose_create(err, svn_wc__release_write_lock(ctx->wc_ctx,
