svn commit: r1660539 - /subversion/trunk/subversion/libsvn_ra/ra_loader.c

[rhuijben]

Author: rhuijben
Date: Tue Feb 17 23:46:53 2015
New Revision: 1660539

URL: http://svn.apache.org/r1660539
Log:
* subversion/libsvn_ra/ra_loader.c
  (svn_ra_get_file_revs2): Also perform the capability check if start revision
    specifies HEAD. Don't use the log fallback when asking for merged
    revisions, as that isn't going to work.

Modified:
    subversion/trunk/subversion/libsvn_ra/ra_loader.c

Modified: subversion/trunk/subversion/libsvn_ra/ra_loader.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/ra_loader.c?rev=1660539&r1=1660538&r2=1660539&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/trunk/subversion/libsvn_ra/ra_loader.c Tue Feb 17 23:46:53 2015
@@ -1004,7 +1004,7 @@ svn_error_t *svn_ra_get_file_revs2(svn_r
   if (include_merged_revisions)
     SVN_ERR(svn_ra__assert_mergeinfo_capable_server(session, NULL, pool));
 
-  if (start > end)
+  if (start > end || !SVN_IS_VALID_REVNUM(start))
     SVN_ERR(
      svn_ra__assert_capable_server(session,
                                    SVN_RA_CAPABILITY_GET_FILE_REVS_REVERSE,
@@ -1014,7 +1014,8 @@ svn_error_t *svn_ra_get_file_revs2(svn_r
   err = session->vtable->get_file_revs(session, path, start, end,
                                        include_merged_revisions,
                                        handler, handler_baton, pool);
-  if (err && (err->apr_err == SVN_ERR_RA_NOT_IMPLEMENTED))
+  if (err && (err->apr_err == SVN_ERR_RA_NOT_IMPLEMENTED)
+      && !include_merged_revisions)
     {
       svn_error_clear(err);
 
@@ -1022,7 +1023,7 @@ svn_error_t *svn_ra_get_file_revs2(svn_r
       err = svn_ra__file_revs_from_log(session, path, start, end,
                                        handler, handler_baton, pool);
     }
-  return err;
+  return svn_error_trace(err);
 }
 
 svn_error_t *svn_ra_lock(svn_ra_session_t *session,