Author: stsp
Date: Mon Feb 25 17:35:11 2013
New Revision: 1449785
URL: http://svn.apache.org/r1449785
Log:
Allow moved-away nodes shadowed by a replacing layer to be updated or broken
by the conflict resolver.
* subversion/libsvn_wc/conflicts.c
(resolve_tree_conflict_on_node): Allow resolving 'incoming edit vs. local
replace' in the same manner as 'incoming edit vs. local delete'.
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=1449785&r1=1449784&r2=1449785&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Mon Feb 25 17:35:11 2013
@@ -2664,7 +2664,8 @@ resolve_tree_conflict_on_node(svn_skel_t
if (operation == svn_wc_operation_update
|| operation == svn_wc_operation_switch)
{
- if (reason == svn_wc_conflict_reason_deleted)
+ if (reason == svn_wc_conflict_reason_deleted ||
+ reason == svn_wc_conflict_reason_replaced)
{
if (conflict_choice == svn_wc_conflict_choose_merged)
{
