You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/02/19 15:36:42 UTC
svn commit: r1731250 - in /subversion/trunk/subversion:
libsvn_client/resolved.c libsvn_wc/conflicts.c
Author: stsp
Date: Fri Feb 19 14:36:42 2016
New Revision: 1731250
URL: http://svn.apache.org/viewvc?rev=1731250&view=rev
Log:
Really perform updates of moved-away nodes with the new conflict resolver.
* subversion/libsvn_client/resolved.c
(resolve_tree_conflict): Check for the right option_id. The resolver already
uses svn_client_conflict_option_update_move_destination internally, instead
of svn_client_conflict_option_working_text_where_conflicted.
With this change, updates of moved-away nodes take the new code path.
* subversion/libsvn_wc/conflicts.c
(svn_wc__conflict_tree_update_moved_away_node): We must mark the conflict
resolved manually because svn_wc__db_update_moved_away_conflict_victim()
does not mark the conflict resolved for us.
Modified:
subversion/trunk/subversion/libsvn_client/resolved.c
subversion/trunk/subversion/libsvn_wc/conflicts.c
Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1731250&r1=1731249&r2=1731250&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Fri Feb 19 14:36:42 2016
@@ -846,8 +846,7 @@ resolve_tree_conflict(svn_client_conflic
operation == svn_wc_operation_switch) &&
local_change == svn_wc_conflict_reason_moved_away &&
incoming_change == svn_wc_conflict_action_edit &&
- option_id ==
- svn_client_conflict_option_working_text_where_conflicted)
+ option_id == svn_client_conflict_option_update_move_destination)
{
err = svn_wc__conflict_tree_update_moved_away_node(ctx->wc_ctx,
local_abspath,
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1731250&r1=1731249&r2=1731250&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Fri Feb 19 14:36:42 2016
@@ -3622,7 +3622,12 @@ svn_wc__conflict_tree_update_moved_away_
notify_baton,
scratch_pool));
- /* The conflict was marked resolved by svn_wc__db_op_raise_moved_away(). */
+ SVN_ERR(svn_wc__db_op_mark_resolved(wc_ctx->db, local_abspath,
+ FALSE, FALSE, TRUE,
+ NULL, scratch_pool));
+ SVN_ERR(svn_wc__wq_run(wc_ctx->db, local_abspath, cancel_func, cancel_baton,
+ scratch_pool));
+
if (notify_func)
notify_func(notify_baton,
svn_wc_create_notify(local_abspath, svn_wc_notify_resolved,