svn commit: r1569624 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_ra_neon/log.c subversion/libsvn_ra_serf/log.c

[sv...@apache.org]

Author: svn-role
Date: Wed Feb 19 04:00:09 2014
New Revision: 1569624

URL: http://svn.apache.org/r1569624
Log:
Merge the 1.7.x-r1568872-neon+serf branch:

 * r1568943
   Justification:
     Fixes an API implementation bug in ra_serf and ra_neon.
   Notes:
     This a backport of r1568872 from trunk, with an equivalent change
     for ra_neon. r1568871 added a test case to JavaHL that exposed
     this bug on trunk, but it can't be used to test on 1.7.x. Trunk
     and branch code are identical in ra_serf, and ra_neon has an
     equivalent test with the same bug.
   Branch: ^/subversion/branches/1.7.x-r1568872-neon+serf
   Votes:
     +1: brane, rhuijben, ivan

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/subversion/libsvn_ra_neon/log.c
    subversion/branches/1.7.x/subversion/libsvn_ra_serf/log.c

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
  Merged /subversion/branches/1.7.x-r1568872-neon+serf:r1568942-1569623
  Merged /subversion/trunk:r1568872

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1569624&r1=1569623&r2=1569624&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Feb 19 04:00:09 2014
@@ -106,16 +106,3 @@ Veto-blocked changes:
      -1: stsp (not a bug fix, changes output in a patch release)
 
 Approved changes:
-
- * r1568943
-   Justification:
-     Fixes an API implementation bug in ra_serf and ra_neon.
-   Notes:
-     This a backport of r1568872 from trunk, with an equivalent change
-     for ra_neon. r1568871 added a test case to JavaHL that exposed
-     this bug on trunk, but it can't be used to test on 1.7.x. Trunk
-     and branch code are identical in ra_serf, and ra_neon has an
-     equivalent test with the same bug.
-   Branch: ^/subversion/branches/1.7.x-r1568872-neon+serf
-   Votes:
-     +1: brane, rhuijben, ivan

Modified: subversion/branches/1.7.x/subversion/libsvn_ra_neon/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_neon/log.c?rev=1569624&r1=1569623&r2=1569624&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_neon/log.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_neon/log.c Wed Feb 19 04:00:09 2014
@@ -548,7 +548,7 @@ svn_error_t * svn_ra_neon__get_log(svn_r
      dav_get_resource() to choke on the server.  So instead, we pass a
      baseline-collection URL, which we get from the largest of the
      START and END revisions. */
-  use_rev = (start > end) ? start : end;
+  use_rev = (start == SVN_INVALID_REVNUM || start > end) ? start : end;
   SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL, ras,
                                          ras->url->data, use_rev, pool));
   final_bc_url = svn_path_url_add_component2(bc_url, bc_relative, pool);

Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/log.c?rev=1569624&r1=1569623&r2=1569624&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/log.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/log.c Wed Feb 19 04:00:09 2014
@@ -689,7 +689,7 @@ svn_ra_serf__get_log(svn_ra_session_t *r
   /* At this point, we may have a deleted file.  So, we'll match ra_neon's
    * behavior and use the larger of start or end as our 'peg' rev.
    */
-  peg_rev = (start > end) ? start : end;
+  peg_rev = (start == SVN_INVALID_REVNUM || start > end) ? start : end;
 
   SVN_ERR(svn_ra_serf__get_baseline_info(&basecoll_url, &relative_url, session,
                                          NULL, NULL, peg_rev, NULL, pool));