svn commit: r1064222 - /subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_local/ra_plugin.c

[hw...@apache.org]

Author: hwright
Date: Thu Jan 27 17:34:40 2011
New Revision: 1064222

URL: http://svn.apache.org/viewvc?rev=1064222&view=rev
Log:
On the ignore-mergeinfo-log branch:
Advertise the IGNORE_MERGEINFO RA capability for ra_local.

* subversion/libsvn_ra_local/ra_plugin.c
  (svn_ra_local__has_capability): Don't special-case the IGNORE_MERGEINFO
    capability.

Modified:
    subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_local/ra_plugin.c

Modified: subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_local/ra_plugin.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_local/ra_plugin.c?rev=1064222&r1=1064221&r2=1064222&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_local/ra_plugin.c (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_local/ra_plugin.c Thu Jan 27 17:34:40 2011
@@ -1403,16 +1403,11 @@ svn_ra_local__has_capability(svn_ra_sess
       || strcmp(capability, SVN_RA_CAPABILITY_LOG_REVPROPS) == 0
       || strcmp(capability, SVN_RA_CAPABILITY_PARTIAL_REPLAY) == 0
       || strcmp(capability, SVN_RA_CAPABILITY_COMMIT_REVPROPS) == 0
-      || strcmp(capability, SVN_RA_CAPABILITY_ATOMIC_REVPROPS) == 0)
+      || strcmp(capability, SVN_RA_CAPABILITY_ATOMIC_REVPROPS) == 0
+      || strcmp(capability, SVN_RA_CAPABILITY_IGNORE_MERGEINFO) == 0)
     {
       *has = TRUE;
     }
-  else if (strcmp(capability, SVN_RA_CAPABILITY_IGNORE_MERGEINFO) == 0)
-    {
-      /* ### When the server supports this capability, we'll fold this
-         ### into the above conditional. */
-      *has = FALSE;
-    }
   else if (strcmp(capability, SVN_RA_CAPABILITY_MERGEINFO) == 0)
     {
       /* With mergeinfo, the code's capabilities may not reflect the