You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2012/05/11 15:59:33 UTC
svn commit: r1337167 - /subversion/trunk/subversion/libsvn_client/merge.c
Author: julianfoad
Date: Fri May 11 13:59:33 2012
New Revision: 1337167
URL: http://svn.apache.org/viewvc?rev=1337167&view=rev
Log:
A tiny non-functional tweak in the interest of keeping related info
together.
* subversion/libsvn_client/merge.c
(merge_cousins_and_supplement_mergeinfo): Take the Youngest Common
Ancestor parameter as a whole location (svn_client__pathrev_t) instead
of just a revision number.
(merge_locked, merge_reintegrate_locked, do_symmetric_merge_locked):
Adjust calls.
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=1337167&r1=1337166&r2=1337167&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri May 11 13:59:33 2012
@@ -9098,7 +9098,7 @@ do_merge(apr_hash_t **modified_subtrees,
to represent the changed mergeinfo.
The merge is between SOURCE->url1@rev1 (in URL1_RA_SESSION1) and
- SOURCE->url2@rev2 (in URL2_RA_SESSION2); YC_REV is their youngest
+ SOURCE->url2@rev2 (in URL2_RA_SESSION2); YCA is their youngest
common ancestor.
SAME_REPOS must be true if and only if the source URLs are in the same
repository as the target working copy. Other arguments are as in
@@ -9114,7 +9114,7 @@ merge_cousins_and_supplement_mergeinfo(c
svn_ra_session_t *URL1_ra_session,
svn_ra_session_t *URL2_ra_session,
const merge_source_t *source,
- svn_revnum_t yc_rev,
+ const svn_client__pathrev_t *yca,
svn_boolean_t same_repos,
svn_depth_t depth,
svn_boolean_t ignore_ancestry,
@@ -9139,13 +9139,13 @@ merge_cousins_and_supplement_mergeinfo(c
SVN_ERR(normalize_merge_sources_internal(
&remove_sources, source->loc1,
- svn_rangelist__initialize(source->loc1->rev, yc_rev, TRUE,
+ svn_rangelist__initialize(source->loc1->rev, yca->rev, TRUE,
scratch_pool),
URL1_ra_session, ctx, scratch_pool, subpool));
SVN_ERR(normalize_merge_sources_internal(
&add_sources, source->loc2,
- svn_rangelist__initialize(yc_rev, source->loc2->rev, TRUE,
+ svn_rangelist__initialize(yca->rev, source->loc2->rev, TRUE,
scratch_pool),
URL2_ra_session, ctx, scratch_pool, subpool));
@@ -9535,7 +9535,7 @@ merge_locked(const char *source1,
ra_session1,
ra_session2,
&source,
- yca->rev,
+ yca,
same_repos,
depth,
ignore_ancestry, force,
@@ -10790,7 +10790,7 @@ merge_reintegrate_locked(const char *sou
err = merge_cousins_and_supplement_mergeinfo(target,
target_ra_session,
source_ra_session,
- source, yc_ancestor->rev,
+ source, yc_ancestor,
TRUE /* same_repos */,
svn_depth_infinity,
FALSE /* ignore_ancestry */,
@@ -11517,7 +11517,7 @@ do_symmetric_merge_locked(const svn_clie
err = merge_cousins_and_supplement_mergeinfo(target,
ra_session, ra_session,
- &source, merge->yca->rev,
+ &source, merge->yca,
TRUE /* same_repos */,
depth, ignore_ancestry,
force, record_only,