basic_tests.py fails

I'm getting a failure in basic_tests.py on svn/apache/apr/apr-util checked
out in the last 30 minutes.

at least one test FAILED, checking tests.log.
FAIL: /export/home1/bzajac/Code/Subversion/s/subversion/tests/clients/cmdline/basic_tests.py 5
: basic merge
FAIL: /export/home1/bzajac/Code/Subversion/s/subversion/tests/clients/cmdline/basic_tests.py 6
: basic conflict

Below is the relavent output from tests.log.

Also, there are two gcc -Wall compiler warnings in libsvn_wc/update_editor.c:

subversion/libsvn_wc/update_editor.c: In function `svn_wc_install_file':
subversion/libsvn_wc/update_editor.c:1085: warning: `txtb' might be used
uninitialized in this function
subversion/libsvn_wc/update_editor.c:1085: warning: `tmp_txtb' might be used
uninitialized in this function

Best,
Blair

START: basic_tests.py
PASS: /export/home1/bzajac/Code/Subversion/s/subversion/tests/clients/cmdline/basic_tests.py 1
: basic checkout of a wc
PASS: /export/home1/bzajac/Code/Subversion/s/subversion/tests/clients/cmdline/basic_tests.py 2
: basic status command
PASS: /export/home1/bzajac/Code/Subversion/s/subversion/tests/clients/cmdline/basic_tests.py 3
: basic commit command
PASS: /export/home1/bzajac/Code/Subversion/s/subversion/tests/clients/cmdline/basic_tests.py 4
: basic update command
=============================================================
Expected mu and actual mu are different!
=============================================================
EXPECTED NODE TO BE:
=============================================================
 * Node name: mu
    Path: __SVN_ROOT_NODE/A/mu
    Contents: This is the new line 1 in the backup copy of mu
This is line 2 in mu
This is line 3 in mu
This is line 4 in mu
This is line 5 in mu
This is line 6 in mu
This is line 7 in mu
This is line 8 in mu
This is line 9 in mu
This is line 10 in mu Appended to line 10 of mu

    Properties: {}
    Attributes: {}
    Children: is a file.
=============================================================
ACTUAL NODE FOUND:
=============================================================
 * Node name: mu
    Path: A/mu
    Contents: This is the new line 1 in the backup copy of mu
This is line 2 in mu
This is line 3 in mu
This is line 4 in mu
This is line 5 in mu
This is line 6 in mu
This is line 7 in mu
This is line 8 in mu
This is line 9 in mu
This is line 10 in mu Appended to line 10 of mu
    Properties: {}
    Attributes: {}
    Children: is a file.
Unequal at node mu
Unequal at node A
FAIL: /export/home1/bzajac/Code/Subversion/s/subversion/tests/clients/cmdline/basic_tests.py 5
: basic merge
=============================================================
Expected mu and actual mu are different!
=============================================================
EXPECTED NODE TO BE:
=============================================================
 * Node name: mu
    Path: __SVN_ROOT_NODE/A/mu
    Contents: <<<<<<< .mine
This is the file 'mu'.
Conflicting appended text for mu
||||||| .r1
This is the file 'mu'.
=======
This is the file 'mu'.
Original appended text for mu
>>>>>>> .r2

    Properties: {}
    Attributes: {}
    Children: is a file.
=============================================================
ACTUAL NODE FOUND:
=============================================================
 * Node name: mu
    Path: A/mu
    Contents: <<<<<<< .mine
This is the file 'mu'.
Conflicting appended text for mu||||||| .r1
This is the file 'mu'.=======
This is the file 'mu'.
Original appended text for mu>>>>>>> .r2

    Properties: {}
    Attributes: {}
    Children: is a file.
Unequal at node mu
Unequal at node A
FAIL: /export/home1/bzajac/Code/Subversion/s/subversion/tests/clients/cmdline/basic_tests.py 6
: basic conflict
PASS: /export/home1/bzajac/Code/Subversion/s/subversion/tests/clients/cmdline/basic_tests.py 7
: basic cleanup command
PASS: /export/home1/bzajac/Code/Subversion/s/subversion/tests/clients/cmdline/basic_tests.py 8
: basic revert command
END: basic_tests.py

-- 
Blair Zajac <blair@orcaware.com>
Web and OS performance plots - http://www.orcaware.com/orca/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org