You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2014/02/18 05:00:11 UTC
svn commit: r1569178 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_ra_serf/log.c
Author: svn-role
Date: Tue Feb 18 04:00:11 2014
New Revision: 1569178
URL: http://svn.apache.org/r1569178
Log:
Merge r1568872 from trunk:
* r1568872
Justification:
Fixes an API implementation bug in ra_serf.
Notes:
r1568871 added a test case to JavaHL that exposed this bug on trunk,
but it can't be used to test on 1.8.x. Trunk and branch code are
identical, however.
Votes:
+1: brane, rhuijben, ivan
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_ra_serf/log.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1568872
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1569178&r1=1569177&r2=1569178&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Feb 18 04:00:11 2014
@@ -216,13 +216,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1568872
- Justification:
- Fixes an API implementation bug in ra_serf.
- Notes:
- r1568871 added a test case to JavaHL that exposed this bug on trunk,
- but it can't be used to test on 1.8.x. Trunk and branch code are
- identical, however.
- Votes:
- +1: brane, rhuijben, ivan
Modified: subversion/branches/1.8.x/subversion/libsvn_ra_serf/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_ra_serf/log.c?rev=1569178&r1=1569177&r2=1569178&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_ra_serf/log.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_ra_serf/log.c Tue Feb 18 04:00:11 2014
@@ -571,7 +571,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_stable_url(&req_url, NULL /* latest_revnum */,
session, NULL /* conn */,