Author: julianfoad
Date: Thu Dec 6 15:22:15 2012
New Revision: 1417936
URL: http://svn.apache.org/viewvc?rev=1417936&view=rev
Log:
Remove the 'dry_run' parameter from svn_wc__merge_props(). It isn't needed
here, because this function just returns answers and has no side effects.
* subversion/libsvn_wc/props.h
(svn_wc__merge_props): Remove the 'dry_run' parameter.
* subversion/libsvn_wc/props.c
(svn_wc__merge_props): Remove the 'dry_run' parameter.
(svn_wc__perform_props_merge): Track the change.
* subversion/libsvn_wc/externals.c
(close_file): Track the change.
* subversion/libsvn_wc/merge.c
(svn_wc_merge5): Track the change.
* subversion/libsvn_wc/update_editor.c
(close_directory, close_file): Track the change.
Modified:
subversion/trunk/subversion/libsvn_wc/externals.c
subversion/trunk/subversion/libsvn_wc/merge.c
subversion/trunk/subversion/libsvn_wc/props.c
subversion/trunk/subversion/libsvn_wc/props.h
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/externals.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/externals.c?rev=1417936&r1=1417935&r2=1417936&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/externals.c (original)
+++ subversion/trunk/subversion/libsvn_wc/externals.c Thu Dec 6 15:22:15 2012
@@ -742,7 +742,6 @@ close_file(void *file_baton,
base_props,
actual_props,
regular_prop_changes,
- FALSE /* dry_run */,
pool, pool));
}
else
Modified: subversion/trunk/subversion/libsvn_wc/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/merge.c?rev=1417936&r1=1417935&r2=1417936&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Thu Dec 6 15:22:15 2012
@@ -1253,7 +1253,6 @@ svn_wc_merge5(enum svn_wc_merge_outcome_
wc_ctx->db, target_abspath,
original_props, pristine_props, actual_props,
prop_diff,
- dry_run,
scratch_pool, scratch_pool));
}
Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1417936&r1=1417935&r2=1417936&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Thu Dec 6 15:22:15 2012
@@ -300,7 +300,7 @@ svn_wc__perform_props_merge(svn_wc_notif
baseprops /* server_baseprops */,
pristine_props,
actual_props,
- propchanges, dry_run,
+ propchanges,
scratch_pool, scratch_pool));
if (dry_run)
@@ -1185,7 +1185,6 @@ svn_wc__merge_props(svn_skel_t **conflic
apr_hash_t *pristine_props,
apr_hash_t *actual_props,
const apr_array_header_t *propchanges,
- svn_boolean_t dry_run,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -1282,9 +1281,6 @@ svn_wc__merge_props(svn_skel_t **conflic
{
set_prop_merge_state(state, svn_wc_notify_state_conflicted);
- if (dry_run)
- continue; /* skip to next incoming change */
-
if (!conflict_props)
conflict_props = apr_hash_make(result_pool);
@@ -1297,9 +1293,6 @@ svn_wc__merge_props(svn_skel_t **conflic
/* Finished applying all incoming propchanges to our hashes! */
- if (dry_run)
- return SVN_NO_ERROR;
-
*new_actual_props = actual_props;
if (conflict_props != NULL)
Modified: subversion/trunk/subversion/libsvn_wc/props.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.h?rev=1417936&r1=1417935&r2=1417936&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.h (original)
+++ subversion/trunk/subversion/libsvn_wc/props.h Thu Dec 6 15:22:15 2012
@@ -79,8 +79,6 @@ svn_wc__internal_propget(const svn_strin
If SERVER_BASEPROPS is NULL then use the pristine props as PROPCHANGES
base.
- TODO ### DRY_RUN ...
-
Return the new set of actual properties in *NEW_ACTUAL_PROPS. If
NEW_PRISTINE_PROPS is non-null, then also apply PROPCHANGES to
PRISTINE_PROPS and return the new set of pristine properties in
@@ -103,7 +101,6 @@ svn_wc__merge_props(svn_skel_t **conflic
apr_hash_t *pristine_props,
apr_hash_t *actual_props,
const apr_array_header_t *propchanges,
- svn_boolean_t dry_run,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1417936&r1=1417935&r2=1417936&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu Dec 6 15:22:15
2012
@@ -2493,7 +2493,6 @@ close_directory(void *dir_baton,
base_props,
actual_props,
regular_prop_changes,
- FALSE /* dry_run */,
db->pool,
scratch_pool),
_("Couldn't do property merge"));
@@ -4104,7 +4103,6 @@ close_file(void *file_baton,
current_base_props,
current_actual_props,
regular_prop_changes, /* propchanges */
- FALSE /* dry_run */,
scratch_pool,
scratch_pool));
/* We will ALWAYS have properties to save (after a not-dry-run merge). */
@@ -4236,7 +4234,6 @@ close_file(void *file_baton,
current_base_props /* pristine_props */,
fake_actual_props /* actual_props */,
regular_prop_changes, /* propchanges */
- FALSE /* dry_run */,
scratch_pool,
scratch_pool));
