[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: JavaHL Conflict Resolution callback

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-07-13 01:14:51 CEST

On Wed, 11 Jul 2007, Mark Phippard wrote:

> Get this when I run the tests:
> ................F.....................
> invoking conflict rez callback

This output was due to a stray debugging println() which slipped into
r25717. I've removed it in r25728.

> ....
> ...
> Time: 708.55
> There was 1 failure:
> 1)
> testBasicConflict(org.tigris.subversion.javahl.BasicTests)junit.framework.AssertionFailedError:
> wrong text status in working copy: A/mu expected:<9> but was:<2>
> at org.tigris.subversion.javahl.WC.check(WC.java:468)
> at
> org.tigris.subversion.javahl.SVNTests$OneTest.checkStatus(SVNTests.java:746)
> at
> org.tigris.subversion.javahl.SVNTests$OneTest.checkStatus(SVNTests.java:728)
> at
> org.tigris.subversion.javahl.BasicTests.testBasicConflict(BasicTests.java:1104)
> 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:56)
> Tests run: 44, Failures: 1, Errors: 0

I haven't been able to reproduce this test failure. I seriously doubt
it was related to the stray debug println() I removed. Do you have
any more details on this failure?

> Also, I noticed that when I ran ./autogen.sh there were a bunch of
> warning about missing files related to JavaHL. When I just ran it
> again to copy & paste I did not get them again. So maybe they are
> files that make javahl creates?

I see these warnings:

WARNING: "../include/org_tigris_subversion_javahl_ConflictDescriptor_Action.h" header not found, file subversion/bindings/javahl/native/EnumMapper.cpp
WARNING: "../include/org_tigris_subversion_javahl_ConflictDescriptor_Reason.h" header not found, file subversion/bindings/javahl/native/EnumMapper.cpp
WARNING: "../include/org_tigris_subversion_javahl_ConflictResolverCallback_Result.h" header not found, file subversion/bindings/javahl/native/ConflictResolverCallback.cpp

These header files aren't generated until 'make javahl'-time. What's
checking for them during ./autogen.sh?

Hopefully r25730 will be some use here -- let me know.

  • application/pgp-signature attachment: stored
Received on Fri Jul 13 01:14:20 2007

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.