svn commit: r1346347 - /subversion/trunk/subversion/libsvn_wc/update_editor.c

[rh...@apache.org]

Author: rhuijben
Date: Tue Jun  5 11:21:35 2012
New Revision: 1346347

URL: http://svn.apache.org/viewvc?rev=1346347&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
  (merge_file): Remove an unneeded re-recording of the timestamp. This was
    added during 1.7 development to make sure we didn't drop the recorded
    information on property and lock only changes, but this is now already
    handled by passing the keep_recorded_info flag to base_add_file()
    in close_file().

Modified:
    subversion/trunk/subversion/libsvn_wc/update_editor.c

Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1346347&r1=1346346&r2=1346347&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Jun  5 11:21:35 2012
@@ -3888,7 +3888,6 @@ merge_file(svn_skel_t **work_items,
   struct dir_baton *pb = fb->dir_baton;
   svn_boolean_t is_locally_modified;
   enum svn_wc_merge_outcome_t merge_outcome = svn_wc_merge_unchanged;
-  svn_skel_t *work_item;
   const char *working_abspath = fb->moved_to_abspath ? fb->moved_to_abspath
                                                      : fb->local_abspath;
 
@@ -4059,26 +4058,6 @@ merge_file(svn_skel_t **work_items,
         }
     }
 
-  /* Installing from a pristine will handle timestamps and recording.
-     However, if we are NOT creating a new working copy file, then create
-     work items to handle the recording of the timestamp and working-size. */
-  if (!*install_pristine
-      && !is_locally_modified)
-    {
-      apr_time_t set_date = 0;
-
-      if (eb->use_commit_times && last_changed_date != 0)
-        {
-          set_date = last_changed_date;
-        }
-
-      SVN_ERR(svn_wc__wq_build_record_fileinfo(&work_item,
-                                               eb->db, working_abspath,
-                                               set_date,
-                                               result_pool, scratch_pool));
-      *work_items = svn_wc__wq_merge(*work_items, work_item, result_pool);
-    }
-
   /* Set the returned content state. */
 
   /* This is kind of interesting.  Even if no new text was