Author: hwright
Date: Wed Jun 13 11:08:18 2012
New Revision: 1349756
URL: http://svn.apache.org/viewvc?rev=1349756&view=rev
Log:
* subversion/libsvn_ra_serf/options.c,
subversion/libsvn_client/merge.c:
A few more neon-specific comment rewrites.
Modified:
subversion/trunk/subversion/libsvn_client/merge.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=1349756&r1=1349755&r2=1349756&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Jun 13 11:08:18 2012
@@ -3297,7 +3297,10 @@ adjust_deleted_subtree_ranges(svn_client
forward merge over ra_neon then we get SVN_ERR_RA_DAV_REQUEST_FAILED.
http://subversion.tigris.org/issues/show_bug.cgi?id=3137 fixed some of
the cases where different RA layers returned different error codes to
- signal the "path not found"...but it looks like there is more to do. */
+ signal the "path not found"...but it looks like there is more to do.
+
+ ### Do we still need to special case for ra_neon (since it no longer
+ exists)? */
if (err)
{
if (err->apr_err == SVN_ERR_FS_NOT_FOUND
Modified: subversion/trunk/subversion/libsvn_ra_serf/options.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/options.c?rev=1349756&r1=1349755&r2=1349756&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/options.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/options.c Wed Jun 13 11:08:18
2012
@@ -450,9 +450,7 @@ svn_ra_serf__has_capability(svn_ra_sessi
cap_result = apr_hash_get(serf_sess->capabilities,
capability, APR_HASH_KEY_STRING);
- /* Some capabilities depend on the repository as well as the server.
- NOTE: svn_ra_neon__has_capability() has a very similar code block. If
- you change something here, check there as well. */
+ /* Some capabilities depend on the repository as well as the server. */
if (cap_result == capability_server_yes)
{
if (strcmp(capability, SVN_RA_CAPABILITY_MERGEINFO) == 0)
