subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject svn commit: r927564 - /subversion/trunk/subversion/libsvn_wc/props.c
Date Thu, 25 Mar 2010 19:42:17 GMT
Author: gstein
Date: Thu Mar 25 19:42:16 2010
New Revision: 927564

URL: http://svn.apache.org/viewvc?rev=927564&view=rev
Log:
Use the standard LOG_ACCUM variable name.

* subversion/libsvn_wc/props.c:
  (svn_wc__merge_props): rename ENTRY_ACCUM to LOG_ACCUM

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

Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=927564&r1=927563&r2=927564&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Thu Mar 25 19:42:16 2010
@@ -1532,7 +1532,7 @@ apply_single_prop_change(svn_wc_notify_s
 
 
 svn_error_t *
-svn_wc__merge_props(svn_stringbuf_t **entry_accum,
+svn_wc__merge_props(svn_stringbuf_t **log_accum,
                     svn_wc_notify_state_t *state,
                     apr_hash_t **new_base_props,
                     apr_hash_t **new_actual_props,
@@ -1757,13 +1757,13 @@ svn_wc__merge_props(svn_stringbuf_t **en
       /* We've now guaranteed that some kind of .prej file exists
          above the .svn/ dir.  We write log entries to append our
          conflicts to it. */
-      SVN_WC__FLUSH_LOG_ACCUM(db, adm_abspath, *entry_accum, scratch_pool);
+      SVN_WC__FLUSH_LOG_ACCUM(db, adm_abspath, *log_accum, scratch_pool);
       SVN_ERR(svn_wc__loggy_append(db, adm_abspath, reject_tmp_path,
                                    reject_path, result_pool));
 
       /* And of course, delete the temporary reject file. */
-      SVN_WC__FLUSH_LOG_ACCUM(db, adm_abspath, *entry_accum, scratch_pool);
-      SVN_ERR(svn_wc__loggy_remove(entry_accum, adm_abspath,
+      SVN_WC__FLUSH_LOG_ACCUM(db, adm_abspath, *log_accum, scratch_pool);
+      SVN_ERR(svn_wc__loggy_remove(log_accum, adm_abspath,
                                    reject_tmp_path, result_pool,
                                    scratch_pool));
 
@@ -1772,8 +1772,8 @@ svn_wc__merge_props(svn_stringbuf_t **en
         svn_wc_entry_t entry;
 
         entry.prejfile = svn_dirent_is_child(adm_abspath, reject_path, NULL);
-        SVN_WC__FLUSH_LOG_ACCUM(db, adm_abspath, *entry_accum, scratch_pool);
-        SVN_ERR(svn_wc__loggy_entry_modify(entry_accum, adm_abspath,
+        SVN_WC__FLUSH_LOG_ACCUM(db, adm_abspath, *log_accum, scratch_pool);
+        SVN_ERR(svn_wc__loggy_entry_modify(log_accum, adm_abspath,
                                            local_abspath, &entry,
                                            SVN_WC__ENTRY_MODIFY_PREJFILE,
                                            result_pool, scratch_pool));



Mime
View raw message