Author: pburba
Date: Mon Jul 11 18:17:22 2011
New Revision: 1145269
URL: http://svn.apache.org/viewvc?rev=1145269&view=rev
Log:
Commit a non-controversial part of julianfoad's patch from
http://svn.haxx.se/dev/archive-2011-07/0228.shtml.
* subversion/libsvn_client/mergeinfo.h
(svn_client__get_repos_mergeinfo): Consolidate comment re inherited
mergeinfo validation.
Modified:
subversion/trunk/subversion/libsvn_client/mergeinfo.h
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.h?rev=1145269&r1=1145268&r2=1145269&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.h (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.h Mon Jul 11 18:17:22
2011
@@ -168,17 +168,11 @@ svn_client__get_wc_mergeinfo_catalog(svn
doesn't support a mergeinfo capability and SQUELCH_INCAPABLE is
TRUE, set *TARGET_MERGEINFO to NULL.
- If the *TARGET_MERGEINFO for REL_PATH path is inherited and
- *VALIDATE_INHERITED_MERGEINFO is TRUE, then *TARGET_MERGEINFO
- will only contain merge source path-revisions that actually
- exist in repository.
-
- If the *TARGET_MERGEINFO for REL_PATH path is inherited,
+ If the mergeinfo for REL_PATH path is inherited,
VALIDATE_INHERITED_MERGEINFO is TRUE, and the server supports
the #SVN_RA_CAPABILITY_VALIDATE_INHERITED_MERGEINFO capability,
- then request that the server validate the mergeinfo in
- *TARGET_MERGEINFO, so it contains only merge source path-revisions
- that actually exist in repository. */
+ then *TARGET_MERGEINFO will only contain merge source path-revisions
+ that actually exist in the repository. */
svn_error_t *
svn_client__get_repos_mergeinfo(svn_ra_session_t *ra_session,
svn_mergeinfo_t *target_mergeinfo,
