You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2013/02/11 18:00:31 UTC
svn commit: r1444863 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Author: philip
Date: Mon Feb 11 17:00:31 2013
New Revision: 1444863
URL: http://svn.apache.org/r1444863
Log:
* subversion/libsvn_wc/conflicts.c
(resolve_conflict_on_node): Only do move-update stuff when the
moved-away conflict is reason=edit. This fixes a SEGV
resolving reason=delete conflicts.
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.c
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1444863&r1=1444862&r2=1444863&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Mon Feb 11 17:00:31 2013
@@ -2609,8 +2609,9 @@ resolve_conflict_on_node(svn_boolean_t *
if (resolve_tree)
{
svn_wc_conflict_reason_t reason;
+ svn_wc_conflict_action_t action;
- SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, NULL, NULL,
+ SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action, NULL,
db, local_abspath,
conflicts,
scratch_pool, scratch_pool));
@@ -2627,7 +2628,8 @@ resolve_conflict_on_node(svn_boolean_t *
*did_resolve = TRUE;
}
}
- else if (reason == svn_wc_conflict_reason_moved_away)
+ else if (reason == svn_wc_conflict_reason_moved_away
+ && action == svn_wc_conflict_action_edit)
{
/* After updates, we can resolve local moved-away
* vs. any incoming change, either by updating the