subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1231916 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Mon, 16 Jan 2012 10:58:28 GMT
Author: julianfoad
Date: Mon Jan 16 10:58:27 2012
New Revision: 1231916

URL: http://svn.apache.org/viewvc?rev=1231916&view=rev
Log:
* subversion/libsvn_client/merge.c
  (find_unmerged_mergeinfo): Rename a parameter. A follow-up to r1230578.

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=1231916&r1=1231915&r2=1231916&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Jan 16 10:58:27 2012
@@ -9898,7 +9898,7 @@ find_unmerged_mergeinfo(svn_mergeinfo_ca
                         svn_revnum_t *youngest_merged_rev,
                         svn_revnum_t yc_ancestor_rev,
                         svn_mergeinfo_catalog_t source_catalog,
-                        apr_hash_t *target_segments_hash,
+                        apr_hash_t *target_history_hash,
                         const char *source_repos_rel_path,
                         const char *target_repos_rel_path,
                         svn_revnum_t target_rev,
@@ -9926,7 +9926,7 @@ find_unmerged_mergeinfo(svn_mergeinfo_ca
 
   /* Examine the natural history of each path in the reintegrate target
      with explicit mergeinfo. */
-  for (hi = apr_hash_first(scratch_pool, target_segments_hash);
+  for (hi = apr_hash_first(scratch_pool, target_history_hash);
        hi;
        hi = apr_hash_next(hi))
     {



Mime
View raw message