subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1772614 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Mon, 05 Dec 2016 09:44:24 GMT
Author: stsp
Date: Mon Dec  5 09:44:23 2016
New Revision: 1772614

URL: http://svn.apache.org/viewvc?rev=1772614&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (find_nested_move): Remove unused parameters.
  (find_deleted_rev): Update caller.

Modified:
    subversion/trunk/subversion/libsvn_client/conflicts.c

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1772614&r1=1772613&r2=1772614&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Dec  5 09:44:23 2016
@@ -631,8 +631,6 @@ static svn_error_t *
 find_nested_move(const char **moved_from_repos_relpath,
                  struct copy_info **move_destination,
                  const char *deleted_repos_relpath,
-                 const char *related_repos_relpath,
-                 svn_revnum_t related_repos_peg_rev,
                  apr_array_header_t *moves,
                  apr_hash_t *copies,
                  apr_array_header_t *deleted_paths,
@@ -875,8 +873,6 @@ find_deleted_rev(void *baton,
 
           SVN_ERR(find_nested_move(&moved_from_repos_relpath, &copy,
                                    b->deleted_repos_relpath,
-                                   b->related_repos_relpath,
-                                   b->related_repos_peg_rev,
                                    moves, copies, deleted_paths,
                                    log_entry->revision,
                                    b->repos_root_url,



Mime
View raw message