svn commit: r1771907 - /subversion/trunk/subversion/libsvn_client/conflicts.c

[st...@apache.org]

Author: stsp
Date: Tue Nov 29 13:57:08 2016
New Revision: 1771907

URL: http://svn.apache.org/viewvc?rev=1771907&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (conflict_tree_get_details_local_missing): This function works for updates
   as it is, so don't restrict it to merge operations. Gets us one step closer
   to resolving the tree conflict left behind at the end of conflict test 25
   since the nested file move present in this test is now detected.

Modified:
    subversion/trunk/subversion/libsvn_client/conflicts.c

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1771907&r1=1771906&r2=1771907&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Tue Nov 29 13:57:08 2016
@@ -1559,10 +1559,6 @@ conflict_tree_get_details_local_missing(
   const char *related_repos_relpath;
   svn_revnum_t related_peg_rev;
 
-  /* We only handle merges here. */
-  if (svn_client_conflict_get_operation(conflict) != svn_wc_operation_merge)
-    return SVN_NO_ERROR;
-
   SVN_ERR(svn_client_conflict_get_incoming_old_repos_location(
             &old_repos_relpath, &old_rev, NULL, conflict,
             scratch_pool, scratch_pool));
@@ -1570,9 +1566,8 @@ conflict_tree_get_details_local_missing(
             &new_repos_relpath, &new_rev, NULL, conflict,
             scratch_pool, scratch_pool));
 
-  /* A deletion of the node may have happened on the branch we
-   * merged to. Scan the conflict victim's parent's log to find
-   * a revision which deleted the node. */
+  /* Scan the conflict victim's parent's log to find a revision which
+   * deleted the node. */
   deleted_basename = svn_dirent_basename(conflict->local_abspath,
                                          scratch_pool);
   SVN_ERR(svn_wc__node_get_repos_info(NULL, &parent_repos_relpath,