On Mon, 2010-02-01, Philip Martin wrote: > "C. Michael Pilato" <cmpil...@collab.net> writes: > > > Oh, I dunno. r8391162080374191731 seems a bit ... off. (But yes, the > > regexps don't match -- they expect "Recording mergeinfo for reverse merge" > > but get "Recording mergeinfo for merge" (no "reverse"). > > I didn't spot that! 8391162080374191731 is 0x747365742D6E7673 which > looks like an ASCII string. I guess we have a pool use problem.
FWIW I can't reproduce the problem. The tests pass for me. I tried running the merge_tests.py with "svn" replaced by "valgrind ... svn": [[[ Index: subversion/tests/cmdline/svntest/main.py =================================================================== --- subversion/tests/cmdline/svntest/main.py (revision 905541) +++ subversion/tests/cmdline/svntest/main.py (working copy) @@ -601,7 +601,8 @@ If ERROR_EXPECTED is None, any stderr also will be printed. If you're just checking that something does/doesn't come out of stdout/stderr, you might want to use actions.run_and_verify_svn().""" - return run_command(svn_binary, error_expected, 0, + varargs = ('--log-file=/tmp/svn-valgrind/%p.log', '--error-exitcode=99', svn_binary) + varargs + return run_command('valgrind', error_expected, 0, *(_with_auth(_with_config_dir(varargs)))) # For running svnadmin. Ignores the output. ]]] No warnings showed up in the *.log files, only messages indicating there were no problems, but I'm not sure if I set it up correctly. - Julian