You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2012/07/09 12:55:18 UTC
svn commit: r1359054 - in /subversion/trunk/subversion/libsvn_wc: wc_db.c
wc_db.h
Author: philip
Date: Mon Jul 9 10:55:18 2012
New Revision: 1359054
URL: http://svn.apache.org/viewvc?rev=1359054&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_op_copy_file): Rename parameter to avoid a compiler
warning about shadowing.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1359054&r1=1359053&r2=1359054&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Jul 9 10:55:18 2012
@@ -4686,7 +4686,7 @@ svn_wc__db_op_copy_file(svn_wc__db_t *db
const char *original_uuid,
svn_revnum_t original_revision,
const svn_checksum_t *checksum,
- svn_boolean_t set_actual_props,
+ svn_boolean_t update_actual_props,
const apr_hash_t *new_actual_props,
svn_boolean_t is_move,
const svn_skel_t *conflict,
@@ -4739,9 +4739,9 @@ svn_wc__db_op_copy_file(svn_wc__db_t *db
iwb.checksum = checksum;
- if (set_actual_props)
+ if (update_actual_props)
{
- iwb.update_actual_props = set_actual_props;
+ iwb.update_actual_props = update_actual_props;
iwb.new_actual_props = new_actual_props;
}
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1359054&r1=1359053&r2=1359054&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Mon Jul 9 10:55:18 2012
@@ -1331,7 +1331,7 @@ svn_wc__db_op_copy_file(svn_wc__db_t *db
const char *original_uuid,
svn_revnum_t original_revision,
const svn_checksum_t *checksum,
- svn_boolean_t set_actual_props,
+ svn_boolean_t update_actual_props,
const apr_hash_t *new_actual_props,
svn_boolean_t is_move,
const svn_skel_t *conflict,