You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/07/04 06:08:07 UTC
svn commit: r1499643 -
/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
Author: brane
Date: Thu Jul 4 04:08:07 2013
New Revision: 1499643
URL: http://svn.apache.org/r1499643
Log:
[in subversion/bindings/javahl/tests/org/apache/subversion/javahl]
* SVNRemoteTests.java (SVNRemoteTests.testBranchMergeinfo):
Check for inherited instead of explicit mergeinfo on the branch.
Modified:
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
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=1499643&r1=1499642&r2=1499643&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 04:08:07 2013
@@ -951,12 +951,14 @@ public class SVNRemoteTests extends SVNT
client.commit(thisTest.getWCPathSet(), Depth.infinity, false, false,
null, null, cmcb, null);
- // Check mergeinfo on updated branch
+ // Check inherited mergeinfo on updated branch
+ paths.set(0, "Abranch/mu");
catalog = session.getMergeinfo(paths, 4L,
- Mergeinfo.Inheritance.explicit,
+ Mergeinfo.Inheritance.nearest_ancestor,
false);
assertEquals(1, catalog.size());
- List<RevisionRange> ranges = catalog.get("Abranch").getRevisions("/A");
+ List<RevisionRange> ranges =
+ catalog.get("Abranch/mu").getRevisions("/A/mu");
assertEquals(1, ranges.size());
assertEquals("1-3*", ranges.get(0).toString());
}