subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1736326 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Wed, 23 Mar 2016 14:36:26 GMT
Author: stsp
Date: Wed Mar 23 14:36:26 2016
New Revision: 1736326

URL: http://svn.apache.org/viewvc?rev=1736326&view=rev
Log:
Follow-up to r1736320: Fix a crash.

* subversion/libsvn_client/conflicts.c
  (conflict_tree_get_details_incoming_delete): Request revprops and pass
   a result pool for find_deleted_rev() to use.

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=1736326&r1=1736325&r2=1736326&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Mar 23 14:36:26 2016
@@ -2035,6 +2035,7 @@ conflict_tree_get_details_incoming_delet
           const char *corrected_url;
           svn_string_t *author_revprop;
           apr_array_header_t *paths;
+          apr_array_header_t *revprops;
           struct find_deleted_rev_baton b;
           svn_error_t *err;
 
@@ -2059,6 +2060,9 @@ conflict_tree_get_details_incoming_delet
           paths = apr_array_make(scratch_pool, 1, sizeof(const char *));
           APR_ARRAY_PUSH(paths, const char *) = "";
 
+          revprops = apr_array_make(scratch_pool, 1, sizeof(const char *));
+          APR_ARRAY_PUSH(revprops, const char *) = SVN_PROP_REVISION_AUTHOR;
+
           b.deleted_repos_relpath = new_repos_relpath;
           b.related_repos_relpath = old_repos_relpath;
           b.related_repos_peg_rev = old_rev;
@@ -2067,15 +2071,14 @@ conflict_tree_get_details_incoming_delet
           b.repos_root_url = repos_root_url;
           b.repos_uuid = repos_uuid;
           b.ctx = conflict->ctx;
+          b.result_pool = scratch_pool;
 
           err = svn_ra_get_log2(ra_session, paths, new_rev, 0,
                                  0, /* no limit */
                                  TRUE, /* need the changed paths list */
                                  FALSE, /* need to traverse copies */
                                  FALSE, /* no need for merged revisions */
-                                 /* no need for revprops: */
-                                 apr_array_make(scratch_pool, 0,
-                                                sizeof(const char *)),
+                                 revprops,
                                  find_deleted_rev, &b,
                                  scratch_pool);
           if (err)



Mime
View raw message