svn commit: r1438994 - in /subversion/trunk/subversion/libsvn_client: merge.c repos_diff.c

[rh...@apache.org]

Author: rhuijben
Date: Sat Jan 26 23:45:47 2013
New Revision: 1438994

URL: http://svn.apache.org/viewvc?rev=1438994&view=rev
Log:
* subversion/libsvn_client/merge.c
  (notification_receiver): Remove the moved path translater as it is currently
    untested. And if it had worked, it would have broken mergeinfo to both
    source and target of the move. This needs a careful design, which according
    to the wiki is out of scope for 1.8.

* subversion/libsvn_client/repos_diff.c
  (diff_state_absent): Use kind unknown for absent node.

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

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1438994&r1=1438993&r2=1438994&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Sat Jan 26 23:45:47 2013
@@ -3160,32 +3160,6 @@ notification_receiver(void *baton, const
    * retrieve that info here, instead of querying the WC again here. */
   notify_abspath = svn_dirent_join(merge_b->target->abspath,
                                    notify->path, pool);
-  if (notify->action == svn_wc_notify_update_update
-      && notify->kind == svn_node_file)
-    {
-      svn_error_t *err;
-      const char *moved_to_abspath;
-
-      err = svn_wc__node_was_moved_away(&moved_to_abspath, NULL,
-                                        merge_b->ctx->wc_ctx,
-                                        notify_abspath, pool, pool);
-      if (err)
-        {
-          if (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
-            {
-              svn_error_clear(err);
-              moved_to_abspath = NULL;
-            }
-          else
-            {
-              /* ### return svn_error_trace(err); */
-              svn_error_clear(err);
-              return;
-            }
-        }
-      if (moved_to_abspath)
-        notify_abspath = moved_to_abspath;
-    }
 
   /* Notify that a merge is beginning, if we haven't already done so.
    * (A single-file merge is notified separately: see single_file_merge_notify().) */
@@ -5336,10 +5310,10 @@ drive_merge_report_editor(const char *ta
 
           absent_abspath = svn_dirent_join(target_abspath,
                                            svn__apr_hash_index_key(hi),
-                                           merge_b->pool);
+                                           scratch_pool);
 
-          apr_hash_set(merge_b->skipped_abspaths, absent_abspath,
-                       APR_HASH_KEY_STRING, absent_abspath);
+          record_skip(merge_b, absent_abspath, svn_node_unknown,
+                      svn_wc_notify_state_missing, scratch_pool);
         }
     }
   return SVN_NO_ERROR;

Modified: subversion/trunk/subversion/libsvn_client/repos_diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/repos_diff.c?rev=1438994&r1=1438993&r2=1438994&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/repos_diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/repos_diff.c Sat Jan 26 23:45:47 2013
@@ -1483,7 +1483,7 @@ diff_state_absent(const char *relpath,
       svn_wc_notify_t *notify
         = svn_wc_create_notify(relpath, svn_wc_notify_skip, scratch_pool);
 
-      notify->kind = svn_node_file;
+      notify->kind = svn_node_unknown;
       notify->content_state = notify->prop_state
         = svn_wc_notify_state_missing;
       (*dnb->notify_func)(dnb->notify_baton, notify, scratch_pool);