subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1417881 - in /subversion/trunk/subversion/libsvn_wc: externals.c merge.c props.c props.h update_editor.c
Date Thu, 06 Dec 2012 13:43:54 GMT
Author: julianfoad
Date: Thu Dec  6 13:43:53 2012
New Revision: 1417881

URL: http://svn.apache.org/viewvc?rev=1417881&view=rev
Log:
Remove an unused parameter from svn_wc__merge_props().

* subversion/libsvn_wc/props.h
  (svn_wc__merge_props): Remove the 'kind' parameter.

* subversion/libsvn_wc/props.c
  (svn_wc__merge_props): Remove the 'kind' 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=1417881&r1=1417880&r2=1417881&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/externals.c (original)
+++ subversion/trunk/subversion/libsvn_wc/externals.c Thu Dec  6 13:43:53 2012
@@ -738,7 +738,6 @@ close_file(void *file_baton,
                                       &new_pristine_props,
                                       &new_actual_props,
                                       eb->db, eb->local_abspath,
-                                      svn_kind_file,
                                       NULL /* server_baseprops*/,
                                       base_props,
                                       actual_props,

Modified: subversion/trunk/subversion/libsvn_wc/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/merge.c?rev=1417881&r1=1417880&r2=1417881&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Thu Dec  6 13:43:53 2012
@@ -1250,7 +1250,7 @@ svn_wc_merge5(enum svn_wc_merge_outcome_
       SVN_ERR(svn_wc__merge_props(&conflict_skel,
                                   merge_props_outcome,
                                   &new_pristine_props, &new_actual_props,
-                                  wc_ctx->db, target_abspath, svn_kind_file,
+                                  wc_ctx->db, target_abspath,
                                   original_props, pristine_props, actual_props,
                                   prop_diff, FALSE /* base_merge */,
                                   dry_run,

Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1417881&r1=1417880&r2=1417881&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Thu Dec  6 13:43:53 2012
@@ -295,7 +295,7 @@ svn_wc__perform_props_merge(svn_wc_notif
      prepping tempfiles and writing log commands.  */
   SVN_ERR(svn_wc__merge_props(&conflict_skel, state,
                               &new_pristine_props, &new_actual_props,
-                              db, local_abspath, kind,
+                              db, local_abspath,
                               baseprops /* server_baseprops */,
                               pristine_props,
                               actual_props,
@@ -1179,7 +1179,6 @@ svn_wc__merge_props(svn_skel_t **conflic
                     apr_hash_t **new_actual_props,
                     svn_wc__db_t *db,
                     const char *local_abspath,
-                    svn_kind_t kind,
                     apr_hash_t *server_baseprops,
                     apr_hash_t *pristine_props,
                     apr_hash_t *actual_props,

Modified: subversion/trunk/subversion/libsvn_wc/props.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.h?rev=1417881&r1=1417880&r2=1417881&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.h (original)
+++ subversion/trunk/subversion/libsvn_wc/props.h Thu Dec  6 13:43:53 2012
@@ -102,7 +102,6 @@ svn_wc__merge_props(svn_skel_t **conflic
                     apr_hash_t **new_actual_props,
                     svn_wc__db_t *db,
                     const char *local_abspath,
-                    svn_kind_t kind,
                     apr_hash_t *server_baseprops,
                     apr_hash_t *pristine_props,
                     apr_hash_t *actual_props,

Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1417881&r1=1417880&r2=1417881&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu Dec  6 13:43:53 2012
@@ -2489,7 +2489,6 @@ close_directory(void *dir_baton,
                                     &new_actual_props,
                                     eb->db,
                                     db->local_abspath,
-                                    svn_kind_dir,
                                     NULL /* use baseprops */,
                                     base_props,
                                     actual_props,
@@ -4104,7 +4103,6 @@ close_file(void *file_baton,
                                   &new_actual_props,
                                   eb->db,
                                   fb->local_abspath,
-                                  svn_kind_file,
                                   NULL /* server_baseprops (update, not merge)  */,
                                   current_base_props,
                                   current_actual_props,
@@ -4239,7 +4237,6 @@ close_file(void *file_baton,
                                   &new_actual_props,
                                   eb->db,
                                   fb->local_abspath,
-                                  svn_kind_file,
                                   NULL /* server_baseprops (not merging) */,
                                   current_base_props /* pristine_props */,
                                   fake_actual_props /* actual_props */,



Mime
View raw message