Paul,
I'm assuming the failures in the JavaHL tests are related to the
mergeinfo changes you made. Here are the details I see:
There were 2 failures:
1) testBasicMerge(org.tigris.subversion.javahl.BasicTests)junit.framework.AssertionFailedError:
Missing merge info on
'/Users/mphippard/work/src-trunk/subversion/bindings/javahl/test-work/working_copies/basic_test33/branches/A/mu'
at org.tigris.subversion.javahl.BasicTests.acquireMergeinfoAndAssertEquals(BasicTests.java:2253)
at org.tigris.subversion.javahl.BasicTests.testBasicMerge(BasicTests.java:2439)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at org.tigris.subversion.javahl.RunTests.main(RunTests.java:116)
2) testRecordOnlyMerge(org.tigris.subversion.javahl.BasicTests)junit.framework.AssertionFailedError:
Missing merge info on
'/Users/mphippard/work/src-trunk/subversion/bindings/javahl/test-work/working_copies/basic_test37/branches/A'
at org.tigris.subversion.javahl.BasicTests.acquireMergeinfoAndAssertEquals(BasicTests.java:2253)
at org.tigris.subversion.javahl.BasicTests.testRecordOnlyMerge(BasicTests.java:2659)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at org.tigris.subversion.javahl.RunTests.main(RunTests.java:116)
Both failures are in a helper method that runs after the tests have
done some merges. It calls the API to retrieve the mergeinfo and just
verify it is there.
In both cases, the API is failing when called on the local WC path for
a branch. This seems to be just retrieving the mergeinfo, not the
eligible revisions. Maybe something changed in merge related to
setting the mergeinfo. That said, these tests only started failing
recently.
Let me know how I can help.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2396486
Received on 2009-09-18 16:47:08 CEST