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 2015/03/19 19:23:43 UTC
svn commit: r1667833 - in /subversion/branches/1.9.x: ./ STATUS
subversion/bindings/javahl/native/RemoteSession.cpp
subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
Author: svn-role
Date: Thu Mar 19 18:23:43 2015
New Revision: 1667833
URL: http://svn.apache.org/r1667833
Log:
Merge r1666851 from trunk:
* r1666851
Make JavaHL fetch all revision properties when the api promises too.
Justification:
Simple bugfix makes new in 1.9 code do what it was designed to do.
Votes:
+1: rhuijben, brane
Modified:
subversion/branches/1.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/bindings/javahl/native/RemoteSession.cpp
subversion/branches/1.9.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 19 18:23:43 2015
@@ -89,4 +89,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663338,1663347,1663374,1663450,1663697,1663706,1663749,1664078,1664080,1664084-1664085,1664187,1664191,1664200,1664344,1664476,1664480-1664481,1664483,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664927,1665164,1665611-1665612,1665845,1665850,1665852,1665886,1666270,1666272
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663338,1663347,1663374,1663450,1663697,1663706,1663749,1664078,1664080,1664084-1664085,1664187,1664191,1664200,1664344,1664476,1664480-1664481,1664483,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664927,1665164,1665611-1665612,1665845,1665850,1665852,1665886,1666270,1666272,1666851
Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1667833&r1=1667832&r2=1667833&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Thu Mar 19 18:23:43 2015
@@ -178,13 +178,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1666851
- Make JavaHL fetch all revision properties when the api promises too.
- Justification:
- Simple bugfix makes new in 1.9 code do what it was designed to do.
- Votes:
- +1: rhuijben, brane
-
* r1666690
Record skipped tree during merge on the skip root instead of leaves
Justification:
Modified: subversion/branches/1.9.x/subversion/bindings/javahl/native/RemoteSession.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/RemoteSession.cpp?rev=1667833&r1=1667832&r2=1667833&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/bindings/javahl/native/RemoteSession.cpp (original)
+++ subversion/branches/1.9.x/subversion/bindings/javahl/native/RemoteSession.cpp Thu Mar 19 18:23:43 2015
@@ -877,8 +877,10 @@ RemoteSession::getLog(jobject jpaths,
true, subPool);
if (JNIUtil::isJavaExceptionThrown())
return;
- const apr_array_header_t* revprops = build_string_array(revpropiter,
- false, subPool);
+ const apr_array_header_t* revprops = (jrevprops != NULL)
+ ? build_string_array(revpropiter,
+ false, subPool)
+ : NULL;
if (JNIUtil::isJavaExceptionThrown())
return;
Modified: subversion/branches/1.9.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java?rev=1667833&r1=1667832&r2=1667833&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java (original)
+++ subversion/branches/1.9.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java Thu Mar 19 18:23:43 2015
@@ -937,6 +937,7 @@ public class SVNRemoteTests extends SVNT
0, false, false, false, null,
receiver);
assertEquals(1, receiver.logs.size());
+ assertTrue(receiver.logs.get(0).revprops.size() > 0);
receiver.logs.clear();
session.reparent(getTestRepoUrl() + "/A");
@@ -945,6 +946,7 @@ public class SVNRemoteTests extends SVNT
0, 0, false, false, false, null,
receiver);
assertEquals(2, receiver.logs.size());
+ assertTrue(receiver.logs.get(0).revprops.size() > 0);
}
public void testGetLogMissing() throws Exception