Author: brane
Date: Thu Jul 4 11:52:55 2013
New Revision: 1499730
URL: http://svn.apache.org/r1499730
Log:
Fix a silly typo in JavaHL that made RevisionRange constructors ignore the
inheritable flag.
[in subversion/bindings/javahl/src/org/apache/subversion/javahl/types]
* RevisionRange.java (RevisionRange.RevisionRange): It's called "inheritable".
[in subversion/bindings/javahl/tests/org/apache/subversion/javahl]
* BasicTests.java (BasicTests.acquireMergeinfoAndAssertEquals):
Revert range check to what it was before r1499308.
* SVNRemoteTests.java (SVNRemoteTests.testBranchMergeinfo): Update range check.
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java?rev=1499730&r1=1499729&r2=1499730&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
Thu Jul 4 11:52:55 2013
@@ -45,7 +45,7 @@ public class RevisionRange implements Co
/**
* Creates a new instance. Called by native library.
*/
- protected RevisionRange(long from, long to, boolean inhertiable)
+ protected RevisionRange(long from, long to, boolean inheritable)
{
this.from = Revision.getInstance(from);
this.to = Revision.getInstance(to);
@@ -53,7 +53,7 @@ public class RevisionRange implements Co
}
/** @since 1.9 */
- public RevisionRange(Revision from, Revision to, boolean inhertiable)
+ public RevisionRange(Revision from, Revision to, boolean inheritable)
{
this.from = from;
this.to = to;
Modified:
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1499730&r1=1499729&r2=1499730&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Thu Jul 4 11:52:55 2013
@@ -2317,12 +2317,10 @@ public class BasicTests extends SVNTests
assertTrue("Missing merge info for source '" + mergeSrc + "' on '" +
targetPath + '\'', ranges != null && !ranges.isEmpty());
RevisionRange range = (RevisionRange) ranges.get(0);
- RevisionRange expected =
- new RevisionRange(Revision.getInstance(expectedMergeStart),
- Revision.getInstance(expectedMergeEnd));
- assertTrue("Unexpected first merged revision range for '" +
- mergeSrc + "' on '" + targetPath + '\'',
- 0 == range.compareTo(expected));
+ String expectedMergedRevs = expectedMergeStart + "-" +
expectedMergeEnd;
+ assertEquals("Unexpected first merged revision range for '" +
+ mergeSrc + "' on '" + targetPath + '\'',
+ expectedMergedRevs, range.toString());
// Verify expected available merges.
if (expectedAvailableStart > 0)
Modified:
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java?rev=1499730&r1=1499729&r2=1499730&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
Thu Jul 4 11:52:55 2013
@@ -960,6 +960,6 @@ public class SVNRemoteTests extends SVNT
List<RevisionRange> ranges =
catalog.get("Abranch/mu").getRevisions("/A/mu");
assertEquals(1, ranges.size());
- assertEquals("1-3*", ranges.get(0).toString());
+ assertEquals("1-3", ranges.get(0).toString());
}
}
