merge_tests.py 85 PASSing, but with errorful output, on 1.5.x branch.

On the 1.5.x branch right now, I'm seeing merge_tests.py 85 throwing a bunch
of errorful output, yet still registering as a PASSing test. Is anyone else
seeing something like the following?

--------------------------------------------------------------------------
~/projects/subversion-1.5.x/subversion/tests/cmdline % ./merge_tests.py 85
EXPECTED STDERR (regexp):
.*
ACTUAL STDERR:
EXCEPTION: SVNUnmatchedError
Traceback (most recent call last):
   File
"/home/cmpilato/projects/subversion-1.5.x/subversion/tests/cmdline/svntest/main.py",
line 1078, in run
     rc = apply(self.pred.run, (), kw)
   File
"/home/cmpilato/projects/subversion-1.5.x/subversion/tests/cmdline/svntest/testcase.py",
line 203, in run
     return self.test_case.run(sandbox=sandbox)
   File
"/home/cmpilato/projects/subversion-1.5.x/subversion/tests/cmdline/svntest/testcase.py",
line 121, in run
     return self.func(sandbox)
   File "./merge_tests.py", line 10111, in reintegrate_fail_on_stale_source
     None, None, None, None, True, False, '--reintegrate')
   File
"/home/cmpilato/projects/subversion-1.5.x/subversion/tests/cmdline/svntest/actions.py",
line 629, in run_and_verify_merge
     b_baton, check_props, dry_run, *args)
   File
"/home/cmpilato/projects/subversion-1.5.x/subversion/tests/cmdline/svntest/actions.py",
line 716, in run_and_verify_merge2
     verify.verify_outputs(None, None, err, None, expected_err)
   File
"/home/cmpilato/projects/subversion-1.5.x/subversion/tests/cmdline/svntest/verify.py",
line 324, in verify_outputs
     compare_and_display_lines(message, label, expected, actual, raisable)
   File
"/home/cmpilato/projects/subversion-1.5.x/subversion/tests/cmdline/svntest/verify.py",
line 298, in compare_and_display_lines
     raise raisable
SVNUnmatchedError
PASS: merge_tests.py 85: merge --reintegrate should fail on stale source

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand