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

[rh...@apache.org]

Author: rhuijben
Date: Wed Mar 12 14:52:29 2014
New Revision: 1576769

URL: http://svn.apache.org/r1576769
Log:
* subversion/libsvn_wc/update_editor.c
  (svn_wc__perform_file_merge): Rename variable to make it clearer that this
    is no temporary path, but a path to a file in the pristine store.

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=1576769&r1=1576768&r2=1576769&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Wed Mar 12 14:52:29 2014
@@ -3914,13 +3914,13 @@ svn_wc__perform_file_merge(svn_skel_t **
   const char *merge_left;
   svn_boolean_t delete_left = FALSE;
   const char *path_ext = "";
-  const char *new_text_base_tmp_abspath;
+  const char *new_pristine_abspath;
   enum svn_wc_merge_outcome_t merge_outcome = svn_wc_merge_unchanged;
   svn_skel_t *work_item;
 
   *work_items = NULL;
 
-  SVN_ERR(svn_wc__db_pristine_get_path(&new_text_base_tmp_abspath,
+  SVN_ERR(svn_wc__db_pristine_get_path(&new_pristine_abspath,
                                        db, wri_abspath, new_checksum,
                                        scratch_pool, scratch_pool));
 
@@ -3973,7 +3973,7 @@ svn_wc__perform_file_merge(svn_skel_t **
                                  &merge_outcome,
                                  db,
                                  merge_left,
-                                 new_text_base_tmp_abspath,
+                                 new_pristine_abspath,
                                  local_abspath,
                                  wri_abspath,
                                  oldrev_str, newrev_str, mine_str,