On Fri, Sep 18, 2009 at 4:14 PM, Paul Burba <ptburba_at_gmail.com> wrote:
> You were right about this being caused by the recent svn mergeinfo
> subcommand changes. I botched
> libsvn_client/mergeinfo.c:svn_client_mergeinfo_get_merged() in r39350.
> We don't use this API in Subversion so the test suite obviously
> didn't catch the error. I fixed it in r39445 and clarified
> svn_client_mergeinfo_get_merged()'s doc string. Both of those JavaHL
> tests now pass.
Confirmed, thanks!
On Windows, do you get that one remaining test error?
1) testMergeConflictResolution(org.tigris.subversion.javahl.BasicTests)org.tigris.subversion.javahl.ClientException:
Path is not an immediate child of the specified directory
svn: traced call
svn: traced call
svn: traced call
svn: traced call
svn: traced call
svn: traced call
svn: traced call
svn: traced call
svn: traced call
svn: traced call
svn: traced call
svn: traced call
svn: traced call
svn: traced call
svn: traced call
svn: traced call
svn: traced call
svn: Path '/var/folders/np/np0+f8EnHlacqSEtJRJGqk+++TI/-Tmp-/tempfile.3.tmp'
is not a child of
'/Users/mphippard/work/src-trunk/subversion/bindings/javahl/test-work/working_copies/basic_test36/A'
svn: subversion/libsvn_client/merge.c:9277: (apr_err=125007)
at org.tigris.subversion.javahl.SVNClient.merge(Native Method)
at org.tigris.subversion.javahl.SVNClientSynchronized.merge(SVNClientSynchronized.java:1023)
at org.tigris.subversion.javahl.BasicTests.testMergeConflictResolution(BasicTests.java:2601)
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)
FAILURES!!!
Tests run: 51, Failures: 0, Errors: 1
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2396619
Received on 2009-09-18 22:31:19 CEST