[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: Mark Phippard <markphip_at_gmail.com>
Date: 2007-07-13 01:26:09 CEST

On 7/12/07, Daniel Rall <dlr@collab.net> wrote:
> > 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)
> >
> > FAILURES!!!
> > 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?

I do not get the problem on Windows. That is about all I can add. Do
the details of the expected and found value give any clues?

> > 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.

I noticed I also got them on Windows when I ran gen-make.py so I
imagine that is what produced them when I ran autogen.sh I thought
there was something we did so that these errors did not happen. You
do not get them for SVNClient.cpp as an example. Perhaps that is what
you did in r25730?

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 13 01:25:33 2007

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