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

[hw...@apache.org]

Author: hwright
Date: Tue Jan  4 16:49:28 2011
New Revision: 1055098

URL: http://svn.apache.org/viewvc?rev=1055098&view=rev
Log:
On the ignore-mergeinfo-log branch:
For ra_local, don't advertise the IGNORE_MERGEINFO capability.

* subversion/libsvn_ra_local/ra_plugin.c
  (svn_ra_local__has_capability): Don't advertise the IGNORE_MERGEINFO
    capability until we really have it.

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=1055098&r1=1055097&r2=1055098&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 Tue Jan  4 16:49:28 2011
@@ -1401,11 +1401,16 @@ 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_IGNORE_MERGEINFO) == 0)
+      || strcmp(capability, SVN_RA_CAPABILITY_ATOMIC_REVPROPS) == 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