subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1188142 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Mon, 24 Oct 2011 13:14:46 GMT
Author: julianfoad
Date: Mon Oct 24 13:14:44 2011
New Revision: 1188142

URL: http://svn.apache.org/viewvc?rev=1188142&view=rev
Log:
* subversion/libsvn_client/merge.c
  (mergeinfo_in_catalog): Remove an unused parameter.

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

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1188142&r1=1188141&r2=1188142&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Oct 24 13:14:44 2011
@@ -9745,7 +9745,6 @@ mergeinfo_in_catalog(svn_boolean_t *in_c
                      const char **cat_key_path,
                      const char *repos_rel_path,
                      svn_mergeinfo_t mergeinfo,
-                     svn_revnum_t revision,
                      svn_mergeinfo_catalog_t catalog,
                      apr_pool_t *result_pool,
                      apr_pool_t *scratch_pool)
@@ -9862,7 +9861,7 @@ log_find_operative_revs(void *baton,
 
       SVN_ERR(mergeinfo_in_catalog(&in_catalog, &subtree_missing_this_rev,
                                    source_rel_path, log_entry_as_mergeinfo,
-                                   revision, log_baton->merged_catalog,
+                                   log_baton->merged_catalog,
                                    pool, pool));
 
       if (!in_catalog)



Mime
View raw message