svn commit: r1798005 - in /subversion/trunk/subversion: libsvn_client/conflicts.c tests/libsvn_client/conflicts-test.c

[ph...@apache.org]

Author: philip
Date: Wed Jun  7 22:32:58 2017
New Revision: 1798005

URL: http://svn.apache.org/viewvc?rev=1798005&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (configure_option_incoming_move_file_merge,
   configure_option_incoming_dir_merge): Remove unused variable.

* subversion/tests/libsvn_client/conflicts-test.c
  (create_wc_with_file_add_vs_file_add_update_conflic): Remove unused variable.

Modified:
    subversion/trunk/subversion/libsvn_client/conflicts.c
    subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1798005&r1=1798004&r2=1798005&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Jun  7 22:32:58 2017
@@ -9201,13 +9201,11 @@ configure_option_incoming_move_file_merg
   svn_revnum_t incoming_new_pegrev;
   svn_node_kind_t incoming_new_kind;
   struct conflict_tree_incoming_delete_details *details;
-  svn_wc_operation_t operation;
 
   details = conflict->tree_conflict_incoming_details;
   if (details == NULL || details->moves == NULL)
     return SVN_NO_ERROR;
 
-  operation = svn_client_conflict_get_operation(conflict);
   incoming_change = svn_client_conflict_get_incoming_change(conflict);
   victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict);
   SVN_ERR(svn_client_conflict_get_incoming_old_repos_location(
@@ -9261,13 +9259,11 @@ configure_option_incoming_dir_merge(svn_
   svn_revnum_t incoming_new_pegrev;
   svn_node_kind_t incoming_new_kind;
   struct conflict_tree_incoming_delete_details *details;
-  svn_wc_operation_t operation;
 
   details = conflict->tree_conflict_incoming_details;
   if (details == NULL || details->moves == NULL)
     return SVN_NO_ERROR;
 
-  operation = svn_client_conflict_get_operation(conflict);
   incoming_change = svn_client_conflict_get_incoming_change(conflict);
   victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict);
   SVN_ERR(svn_client_conflict_get_incoming_old_repos_location(

Modified: subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c?rev=1798005&r1=1798004&r2=1798005&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Wed Jun  7 22:32:58 2017
@@ -3612,7 +3612,6 @@ create_wc_with_file_add_vs_file_add_upda
 {
   static const char *new_file_path;
   svn_client_ctx_t *ctx;
-  static const char *trunk_url;
   svn_opt_revision_t opt_rev;
   svn_client_status_t *status;
   struct status_baton sb;
@@ -3647,7 +3646,6 @@ create_wc_with_file_add_vs_file_add_upda
 
   opt_rev.kind = svn_opt_revision_head;
   opt_rev.value.number = SVN_INVALID_REVNUM;
-  trunk_url = apr_pstrcat(b->pool, b->repos_url, "/", trunk_path, SVN_VA_NULL);
 
   /* Ensure that the file has the expected status. */
   sb.result_pool = b->pool;