svn commit: r1731236 - in /subversion/trunk/subversion: include/private/svn_wc_private.h libsvn_wc/conflicts.c

[st...@apache.org]

Author: stsp
Date: Fri Feb 19 12:40:42 2016
New Revision: 1731236

URL: http://svn.apache.org/viewvc?rev=1731236&view=rev
Log:
Fix test fallout caused by recent conflict resolver changes.

* subversion/include/private/svn_wc_private.h
  (svn_wc__conflict_tree_update_break_moved_away): Add 'moved-away' to the
   list of valid local changes for this function.

* subversion/libsvn_wc/conflicts.c
  (svn_wc__conflict_tree_update_break_moved_away): Allow 'moved-away'.

Modified:
    subversion/trunk/subversion/include/private/svn_wc_private.h
    subversion/trunk/subversion/libsvn_wc/conflicts.c

Modified: subversion/trunk/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_wc_private.h?rev=1731236&r1=1731235&r2=1731236&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Fri Feb 19 12:40:42 2016
@@ -1782,8 +1782,8 @@ svn_wc__conflict_prop_mark_resolved(svn_
                                     apr_pool_t *scratch_pool);
 
 /* Resolve a tree conflict where the victim at LOCAL_ABSPATH is a directory
- * which was locally deleted or replaced, and which received an arbitrary
- * incoming change during an update or switch operation.
+ * which was locally deleted, replaced or moved away, and which received an
+ * arbitrary incoming change during an update or switch operation.
  *
  * The conflict is resolved by accepting the current working copy state and
  * breaking the 'moved-here' link for any files or directories which were
@@ -1796,7 +1796,8 @@ svn_wc__conflict_prop_mark_resolved(svn_
  * 
  * operation: svn_wc_operation_update or svn_wc_operation_switch
  * local change: svn_wc_conflict_reason_deleted or
- *               svn_wc_conflict_reason_replaced
+ *               svn_wc_conflict_reason_replaced or
+ *               svn_wc_conflict_reason_moved_away
  * incoming change: any
  *
  * The working copy must already be locked for resolving, e.g. by calling

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1731236&r1=1731235&r2=1731236&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Fri Feb 19 12:40:42 2016
@@ -3433,7 +3433,8 @@ svn_wc__conflict_tree_update_break_moved
                              svn_dirent_local_style(local_abspath,
                                                     scratch_pool));
   if (reason != svn_wc_conflict_reason_deleted &&
-      reason != svn_wc_conflict_reason_replaced)
+      reason != svn_wc_conflict_reason_replaced &&
+      reason != svn_wc_conflict_reason_moved_away)
     return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL,
                              _("Unexpected conflict reason '%s' on '%s'"),
                              svn_token__to_word(reason_map, reason),