Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1438938 -
 /subversion/trunk/subversion/libsvn_client/repos_diff.c
Date: Sat, 26 Jan 2013 18:43:44 -0000
To: commits@subversion.apache.org
From: rhuijben@apache.org
Message-Id: <20130126184345.1695123888FE@eris.apache.org>

Author: rhuijben
Date: Sat Jan 26 18:43:44 2013
New Revision: 1438938

URL: http://svn.apache.org/viewvc?rev=1438938&view=rev
Log:
* subversion/libsvn_client/repos_diff.c
  (diff_state_handle): Consolidate replacement checks in add notification
    handling. Ignore tree conflict case as a failure to delete will certainly
    raise another tree conflict to add something in its place.

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

Modified: subversion/trunk/subversion/libsvn_client/repos_diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/repos_diff.c?rev=1438938&r1=1438937&r2=1438938&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/repos_diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/repos_diff.c Sat Jan 26 18:43:44 2013
@@ -1443,10 +1443,8 @@ diff_state_handle(svn_boolean_t tree_con
       return SVN_NO_ERROR;
     }
 
-  /* This code is copy & pasted from different functions in this file.
-     It is only used from the merge api, and should really be integrated
-     there.
-   */
+  /* This code is only used from the merge api, and should really be
+     integrated there. */
 
     {
       deleted_path_notify_t *dpn;
@@ -1455,6 +1453,11 @@ diff_state_handle(svn_boolean_t tree_con
       svn_node_kind_t notify_kind = (kind == svn_kind_dir) ? svn_node_dir
                                                            : svn_node_file;
 
+      if (for_add)
+        action = svn_wc_notify_update_add;
+      else
+        action = svn_wc_notify_update_update;
+
       /* Find out if a pending delete notification for this path is
       * still around. */
       dpn = apr_hash_get(eb->deleted_paths, relpath, APR_HASH_KEY_STRING);
@@ -1463,28 +1466,15 @@ diff_state_handle(svn_boolean_t tree_con
           /* If any was found, we will handle the pending 'deleted path
           * notification' (DPN) here. Remove it from the list. */
           apr_hash_set(eb->deleted_paths, relpath,
-              APR_HASH_KEY_STRING, NULL);
+                       APR_HASH_KEY_STRING, NULL);
 
           /* the pending delete might be on a different node kind. */
           notify_kind = dpn->kind;
           notify_content_state = notify_prop_state = dpn->state;
-        }
 
-      /* Determine what the notification (ACTION) should be.
-      * In case of a pending 'delete', this might become a 'replace'. */
-      if (dpn)
-        {
-          if (dpn->action == svn_wc_notify_update_delete
-              && for_add)
+          if (for_add && dpn->action == svn_wc_notify_update_delete)
             action = svn_wc_notify_update_replace;
-          else
-            /* Note: dpn->action might be svn_wc_notify_tree_conflict */
-            action = dpn->action;
         }
-      else if (for_add)
-        action = svn_wc_notify_update_add;
-      else
-        action = svn_wc_notify_update_update;
 
       notify = svn_wc_create_notify(relpath, action, scratch_pool);
       notify->kind = notify_kind;