Author: julianfoad Date: Fri Mar 9 15:08:43 2012 New Revision: 1298865 URL: http://svn.apache.org/viewvc?rev=1298865&view=rev Log: Small improvements to some merge doc strings.
* subversion/libsvn_client/merge.c (get_full_mergeinfo): Fix a wrong parameter name in the doc string. (inherit_implicit_mergeinfo_from_parent, ensure_implicit_mergeinfo): Improve the doc string by describing the RA_SESSION parameter. 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=1298865&r1=1298864&r2=1298865&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/merge.c (original) +++ subversion/trunk/subversion/libsvn_client/merge.c Fri Mar 9 15:08:43 2012 @@ -3476,8 +3476,8 @@ fix_deleted_subtree_ranges(const merge_s is older than START, then the base revision is used as the younger bound in place of START. - RA_SESSION is an open RA session to the repository in which SOURCE lives. - It may be temporarily reparented as needed by this function. + RA_SESSION is an RA session open to the repository in which TARGET_ABSPATH + lives. It may be temporarily reparented as needed by this function. Allocate *RECORDED_MERGEINFO and *IMPLICIT_MERGEINFO in RESULT_POOL. Use SCRATCH_POOL for any temporary allocations. */ @@ -3570,7 +3570,7 @@ get_full_mergeinfo(svn_mergeinfo_t *reco /* Helper for ensure_implicit_mergeinfo(). - PARENT, CHILD, REVISION1, REVISION2, RA_SESSION, and CTX + PARENT, CHILD, REVISION1, REVISION2 and CTX are all cascaded from the arguments of the same names in ensure_implicit_mergeinfo(). PARENT and CHILD must both exist, i.e. this function should never be called where CHILD is the merge target. @@ -3580,6 +3580,9 @@ get_full_mergeinfo(svn_mergeinfo_t *reco Set CHILD->IMPLICIT_MERGEINFO to the mergeinfo inherited from PARENT->IMPLICIT_MERGEINFO. CHILD->IMPLICIT_MERGEINFO is allocated in RESULT_POOL. + + RA_SESSION is an RA session open to the repository that contains CHILD. + It may be temporarily reparented by this function. */ static svn_error_t * inherit_implicit_mergeinfo_from_parent(svn_client__merge_path_t *parent, @@ -3630,7 +3633,10 @@ inherit_implicit_mergeinfo_from_parent(s PARENT->IMPLICIT_MERGEINFO, otherwise contact the repository. Use SCRATCH_POOL for all temporary allocations. - PARENT, CHILD, REVISION1, REVISION2, RA_SESSION, and + RA_SESSION is an RA session open to the repository that contains CHILD. + It may be temporarily reparented by this function. + + PARENT, CHILD, REVISION1, REVISION2 and CTX are all cascaded from the arguments of the same name in filter_merged_revisions() and the same conditions for that function hold here. */