Re: JavaHL 1.2 Problem -- Test Case attached

I have done a lot more testing. I can only make the problem happen via
ra_dav. The previous test case I committed works fine, even via ra_dav. I
was able to hack up a test case that anyone should be able to run that
causes the problem.

dlr tested it on FC3 and did not get the problem, so this might be a Win32
only problem. I am going to try to test it on OS X this weekend.

Could someone run this test on Win32 and see if they get the same problem?

I have attached an edited version of BasicTests.java from trunk.

I added a new testMergeCrash() method. It runs 2nd so that you do not
have to wait. The 1st test lets me know I have things setup correctly to
run tests.

The test checks out the Subclipse core project (WC size ~ 1.6 MB) from a
branch in the public repository. It then attempts to merge revision 1131
from the trunk copy of the same project. On my system this crashes every
time.

Here is the new test if you want to just cut & paste it.

    /**
     * thest the basic SVNClient.merge functionality
     * @throws Throwable
     * @since 1.2
     */
    public void testMergeCrash() throws Throwable
    {
        // build the test setup
        OneTest thisTest = new OneTest();
        String wc = thisTest.getWCPath() + "/javahl_test";
 
        String baseURL = "http://svn.collab.net/repos/subclipse";
        String branchURL = baseURL + "/branches/subclipse-3/core";
        String trunkURL = baseURL + "/trunk/subclipse/core";
        Revision fromRev = new Revision.Number(1330);
        Revision toRev = new Revision.Number(1331);
 
        // checkout Subclipse core module from branch
        client.checkout(branchURL, wc, Revision.HEAD, true);
 
        // test --dry-run of r1331 from trunk
        client.merge(trunkURL, fromRev, trunkURL, toRev, wc, false, true,
false, true);

        // now do the real merge of r1331 from trunk
        client.merge(trunkURL, fromRev, trunkURL, toRev, wc, false, true,
false, true);
 
    }

Thanks

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org