Author: stefan2
Date: Sun Apr 13 06:19:31 2014
New Revision: 1586929
URL: http://svn.apache.org/r1586929
Log:
* subversion/libsvn_repos/log.c
(get_combined_mergeinfo_changes): Delay construction of the revision root
object until we may actually need it.
Modified:
subversion/trunk/subversion/libsvn_repos/log.c
Modified: subversion/trunk/subversion/libsvn_repos/log.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/log.c?rev=1586929&r1=1586928&r2=1586929&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/log.c (original)
+++ subversion/trunk/subversion/libsvn_repos/log.c Sun Apr 13 06:19:31 2014
@@ -1009,9 +1009,6 @@ get_combined_mergeinfo_changes(svn_merge
if (! paths->nelts)
return SVN_NO_ERROR;
- /* Create a work subpool and get a root for REV. */
- SVN_ERR(svn_fs_revision_root(&root, fs, rev, scratch_pool));
-
/* Fetch the mergeinfo changes for REV. */
err = fs_mergeinfo_changed(&deleted_mergeinfo_catalog,
&added_mergeinfo_catalog,
@@ -1038,7 +1035,10 @@ get_combined_mergeinfo_changes(svn_merge
if ( apr_hash_count(deleted_mergeinfo_catalog) == 0
&& apr_hash_count(added_mergeinfo_catalog) == 0)
return SVN_NO_ERROR;
-
+
+ /* Create a work subpool and get a root for REV. */
+ SVN_ERR(svn_fs_revision_root(&root, fs, rev, scratch_pool));
+
/* Check our PATHS for any changes to their inherited mergeinfo.
(We deal with changes to mergeinfo directly *on* the paths in the
following loop.) */
