Author: pburba
Date: Wed Apr 3 20:45:38 2013
New Revision: 1464199
URL: http://svn.apache.org/r1464199
Log:
A minor automatic merge optimization.
* subversion/libsvn_client/merge.c:
(source_and_target_t): Remove source_mergeinfo and target_mergeinfo
members, they are no longer referenced.
(find_automatic_merge): Don't populate the defunct members of
source_and_target_t. This saves us one or two round-trips asking for
mergeinfo from the repos.
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=1464199&r1=1464198&r2=1464199&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Apr 3 20:45:38 2013
@@ -11885,14 +11885,6 @@ typedef struct source_and_target_t
svn_ra_session_t *target_ra_session;
branch_history_t target_branch;
- /* The complete mergeinfo on SOURCE.
- That is, the explicit or inherited mergeinfo. */
- svn_mergeinfo_t source_mergeinfo;
-
- /* The complete mergeinfo on (the current, working version of) TARGET.
- That is, the explicit or inherited mergeinfo. */
- svn_mergeinfo_t target_mergeinfo;
-
/* Repos location of the youngest common ancestor of SOURCE and TARGET. */
svn_client__pathrev_t *yca;
} source_and_target_t;
@@ -12217,32 +12209,6 @@ find_automatic_merge(svn_client__pathrev
{
svn_client__pathrev_t *base_on_source, *base_on_target;
- /* Fetch mergeinfo of source branch (tip) and target branch (working). */
- SVN_ERR(svn_client__get_repos_mergeinfo(&s_t->source_mergeinfo,
- s_t->source_ra_session,
- s_t->source->url,
- s_t->source->rev,
- svn_mergeinfo_inherited,
- FALSE /* squelch_incapable */,
- scratch_pool));
- if (! s_t->target->abspath)
- SVN_ERR(svn_client__get_repos_mergeinfo(&s_t->target_mergeinfo,
- s_t->target_ra_session,
- s_t->target->loc.url,
- s_t->target->loc.rev,
- svn_mergeinfo_inherited,
- FALSE /* squelch_incapable */,
- scratch_pool));
- else
- SVN_ERR(svn_client__get_wc_or_repos_mergeinfo(&s_t->target_mergeinfo,
- NULL /* inherited */,
- NULL /* from_repos */,
- FALSE /* repos_only */,
- svn_mergeinfo_inherited,
- s_t->target_ra_session,
- s_t->target->abspath,
- ctx, scratch_pool));
-
/* Get the location-history of each branch. */
s_t->source_branch.tip = s_t->source;
SVN_ERR(svn_client__get_history_as_mergeinfo(
