Author: julianfoad
Date: Fri Jul 8 13:28:18 2011
New Revision: 1144309
URL: http://svn.apache.org/viewvc?rev=1144309&view=rev
Log:
Typo and wording fixes in comments, following r1141981.
* subversion/libsvn_client/merge.c
(get_invalid_inherited_mergeinfo, get_full_mergeinfo): Fix typos and
improve wording in doc strings.
* subversion/libsvn_client/mergeinfo.h
(svn_client__get_wc_or_repos_mergeinfo): Remove a stray asterisk.
* subversion/libsvn_ra_neon/options.c
(svn_ra_neon__has_capability): Remove an incorrect reference to a source
file, leaving just the function name. Add a missing quotation mark.
* subversion/libsvn_ra_serf/options.c
(svn_ra_serf__has_capability): Same.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_client/mergeinfo.h
subversion/trunk/subversion/libsvn_ra_neon/options.c
subversion/trunk/subversion/libsvn_ra_serf/options.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1144309&r1=1144308&r2=1144309&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Jul 8 13:28:18 2011
@@ -3170,7 +3170,7 @@ fix_deleted_subtree_ranges(const char *u
If no mergeinfo is inherited set *INVALID_INHERITED_MERGEINFO to NULL.
If only empty mergeinfo is inherited set *INVALID_INHERITED_MERGEINFO to
- and empty hash.
+ an empty hash.
If non-empty inherited mergeinfo is inherited then, if the server
supports the SVN_RA_CAPABILITY_VALIDATE_INHERITED_MERGEINFO capability,
@@ -3270,8 +3270,8 @@ get_invalid_inherited_mergeinfo(svn_merg
INDIRECT is ignored.
If the server supports the SVN_RA_CAPABILITY_VALIDATE_INHERITED_MERGEINFO
- capability, the resulting *RECORDED_MERGEINFO is inherited, and
- VALIDATE_INHERITED us TRUE, then *RECORDED_MERGEINFO is validated as per
+ capability, and the resulting *RECORDED_MERGEINFO is inherited, and
+ VALIDATE_INHERITED is TRUE, then *RECORDED_MERGEINFO is validated as per
svn_ra_get_mergeinfo2().
If IMPLICIT_MERGEINFO is not NULL then START and END are limits on the
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.h?rev=1144309&r1=1144308&r2=1144309&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.h (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.h Fri Jul 8 13:28:18
2011
@@ -235,7 +235,7 @@ svn_client__get_repos_mergeinfo_catalog(
If TARGET_WCPATH inherited its mergeinfo from a working copy ancestor
or if it was obtained from the repository, set *INDIRECT to TRUE, set it
- to FALSE *otherwise. */
+ to FALSE otherwise. */
svn_error_t *
svn_client__get_wc_or_repos_mergeinfo(svn_mergeinfo_t *target_mergeinfo,
svn_boolean_t *indirect,
Modified: subversion/trunk/subversion/libsvn_ra_neon/options.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/options.c?rev=1144309&r1=1144308&r2=1144309&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/options.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/options.c Fri Jul 8 13:28:18
2011
@@ -402,9 +402,8 @@ svn_ra_neon__has_capability(svn_ra_sessi
capability, APR_HASH_KEY_STRING);
/* Some capabilities depend on the repository as well as the server.
- NOTE: ../libsvn_ra_serf/serf.c:svn_ra_serf__has_capability()
- has a very similar code block. If you change something here,
- check there as well. */
+ NOTE: svn_ra_serf__has_capability() has a very similar code block. If
+ you change something here, check there as well. */
if (cap_result == capability_server_yes)
{
if ((strcmp(capability, SVN_RA_CAPABILITY_MERGEINFO) == 0)
@@ -417,7 +416,7 @@ svn_ra_neon__has_capability(svn_ra_sessi
above didn't even know which repository we were interested in
-- it just told us whether the server supports mergeinfo.
If the answer was 'no', there's no point checking the
- particular repository; but if it was 'yes, we still must
+ particular repository; but if it was 'yes', we still must
change it to 'no' iff the repository itself doesn't
support mergeinfo. */
svn_mergeinfo_catalog_t ignored;
Modified: subversion/trunk/subversion/libsvn_ra_serf/options.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/options.c?rev=1144309&r1=1144308&r2=1144309&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/options.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/options.c Fri Jul 8 13:28:18
2011
@@ -562,9 +562,8 @@ svn_ra_serf__has_capability(svn_ra_sessi
capability, APR_HASH_KEY_STRING);
/* Some capabilities depend on the repository as well as the server.
- NOTE: ../libsvn_ra_neon/session.c:svn_ra_neon__has_capability()
- has a very similar code block. If you change something here,
- check there as well. */
+ NOTE: svn_ra_neon__has_capability() has a very similar code block. If
+ you change something here, check there as well. */
if (cap_result == capability_server_yes)
{
if ((strcmp(capability, SVN_RA_CAPABILITY_MERGEINFO) == 0)
@@ -577,7 +576,7 @@ svn_ra_serf__has_capability(svn_ra_sessi
didn't even know which repository we were interested in
-- it just told us whether the server supports mergeinfo.
If the answer was 'no', there's no point checking the
- particular repository; but if it was 'yes, we still must
+ particular repository; but if it was 'yes', we still must
change it to 'no' iff the repository itself doesn't
support mergeinfo. */
svn_mergeinfo_catalog_t ignored;
