On Wed, 2010-03-31 at 13:01 -0600, Hyrum K. Wright wrote: > 1.6.10 tarballs are up, the magic revision is r929659: > > http://orac.ece.utexas.edu/pub/svn/1.6.10/
For me, merge_tests.py 45 77 79 124 126 all fail, on serf/fsfs. Here's the command and the end of the 'tests.log' output for test 45: $ make davautocheck CLEANUP=1 FS_TYPE=fsfs HTTP_LIBRARY=serf [[[ CMD: svn up svn-test-work/working_copies/merge_tests-45.E_only --config-dir /home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.077241> At revision 7. CMD: svn merge -r5:4 http://localhost:28541/svn-test-work/repositories/merge_tests-45/A/B/E svn-test-work/working_copies/merge_tests-45.E_only --dry-run --config-dir /home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.255633> CMD: svn merge -r5:4 http://localhost:28541/svn-test-work/repositories/merge_tests-45/A/B/E svn-test-work/working_copies/merge_tests-45.E_only --config-dir /home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.266729> ============================================================= Expected '__SVN_ROOT_NODE' and actual '__SVN_ROOT_NODE' in output tree are different! ============================================================= EXPECTED NODE TO BE: ============================================================= * Node name: __SVN_ROOT_NODE Path: __SVN_ROOT_NODE Contents: N/A (node is a directory) Properties: {} Attributes: {} Children: 1 ============================================================= ACTUAL NODE FOUND: ============================================================= * Node name: __SVN_ROOT_NODE Path: __SVN_ROOT_NODE Contents: None Properties: {} Attributes: {} Children: None (node is probably a file) Unequal Types: one Node is a file, the other is a directory ACTUAL OUTPUT TREE: svntest.wc.State('svn-test-work/working_copies/merge_tests-45.E_only/', { }) EXCEPTION: SVNTreeUnequal Traceback (most recent call last): File "/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/main.py", line 1225, in run rc = self.pred.run(**kw) File "/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/testcase.py", line 204, in run return self.test_case.run(sandbox=sandbox) File "/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/testcase.py", line 121, in run return self.func(sandbox) File "/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/merge_tests.py", line 4957, in mergeinfo_inheritance None, 1) File "/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/actions.py", line 820, in run_and_verify_merge b_baton, check_props, dry_run) File "/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/actions.py", line 955, in run_and_verify_merge2 check_props) File "/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/actions.py", line 615, in verify_update tree.compare_trees ("output", actual_output, output_tree) File "/home/julianfoad/src/subversion-1.6.10/subversion/tests/cmdline/svntest/tree.py", line 620, in compare_trees raise SVNTreeUnequal SVNTreeUnequal FAIL: merge_tests.py 45: target inherits mergeinfo from nearest ancestor ]]] System: Ubuntu 9.10. Investigating. - Julian
