On Fri, Apr 16, 2010 at 6:06 AM, Stefan Sperling <s...@elego.de> wrote: > On Thu, Apr 15, 2010 at 12:18:58PM -0500, Hyrum K. Wright wrote: >> 1.6.11 tarballs are up, the magic revision is r934486: >> >> http://people.apache.org/~hwright/svn/1.6.11/ >> >> This differs very little from 1.6.10, but it does have important fixes which >> have been spot tested. Please do you standard tests on this release when >> signing it. (And don't even think about declaring this as "released" until >> I say so, for reasons I won't expound upon here.) >> >> -Hyrum > > Merge test 63 fails for me for fsfs x serf (with serf 0.3.0). > Transcript below. > > Stefan > <snip> > ============================================================= > Merge outputs differ > The dry-run merge output: > --- Merging r5 through r9 into > 'svn-test-work/working_copies/merge_tests-63.files': > C svn-test-work/working_copies/merge_tests-63.files/B > --- Merging r5 through r9 into > 'svn-test-work/working_copies/merge_tests-63.files/mu': > U svn-test-work/working_copies/merge_tests-63.files/mu > --- Merging r5 through r9 into > 'svn-test-work/working_copies/merge_tests-63.files': > C svn-test-work/working_copies/merge_tests-63.files/D > U svn-test-work/working_copies/merge_tests-63.files > Summary of conflicts: > Tree conflicts: 2 > The full merge output: > --- Merging r5 through r9 into > 'svn-test-work/working_copies/merge_tests-63.files/mu': > U svn-test-work/working_copies/merge_tests-63.files/mu > --- Merging r5 through r9 into > 'svn-test-work/working_copies/merge_tests-63.files': > C svn-test-work/working_copies/merge_tests-63.files/D > C svn-test-work/working_copies/merge_tests-63.files/B > U svn-test-work/working_copies/merge_tests-63.files > Summary of conflicts: > Tree conflicts: 2 > ============================================================= > EXCEPTION: SVNUnmatchedError > Traceback (most recent call last): > File "/home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svntest/main.py", > line 1225, in run > rc = self.pred.run(**kw) > File > "/home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svntest/testcase.py", > line 204, in run > return self.test_case.run(sandbox=sandbox) > File > "/home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svntest/testcase.py", > line 121, in run > return self.func(sandbox) > File "/home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/merge_tests.py", > line 7670, in merge_to_sparse_directories > None, 1) > File > "/home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svntest/actions.py", line > 820, in run_and_verify_merge > b_baton, check_props, dry_run) > File > "/home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svntest/actions.py", line > 928, in run_and_verify_merge2 > raise main.SVNUnmatchedError > SVNUnmatchedError > FAIL: merge_tests.py 63: merge to sparse directories
Stefan, I just double checked this test, running with both a debug and release build, both pass. You probably already noticed, but the dry-run and full-merge outputs are semantically equivalent. The only differences are the ordering of the notifications and that the "--- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.files':" notification appears twice. This strikes me more as a limitation in our test suite, rather than a problem with Subversion. Paul
