On Tue, 2008-11-04 at 19:39 +0000, Julian Foad wrote:
> Can anyone help investigate/fix these please?
>
> FAIL: commit_tests.py 28: commit deletion of out-of-date file or dir
> FAIL: merge_tests.py 57: merge should merge mergeinfo
> FAIL: merge_tests.py 123: no self referential filtering on added path
> FAIL: merge_authz_tests.py 1: skipped paths get overriding mergeinfo
> FAIL: revert_tests.py 17: status after replace+, revert, and local rm
Thanks to those who fixed some of these. Now the Windows/fsfs/RA-local
buildbot passes, which puts us in a much better position.
Still failing on RA-svn are:
FAIL: commit_tests.py 28: commit deletion of out-of-date file or dir
FAIL: merge_authz_tests.py 1: skipped paths get overriding mergeinfo
> Initial investigation:
>
> **********
>
> FAIL: commit_tests.py 28: commit deletion of out-of-date file or dir
>
> This test is failing to see the "out of date" error from a commit,
> instead seeing the less helpful "File not found: transaction '3-4', path
> '/A/I'". The "out of date" error occurs with RA-local, but this is with
> RA-svn. See r33994 which changed the error message (in RA-local at
> least) and change the test's expectation accordingly.
>
> [[[
> EXPECTED STDERR (regexp):
> .*(out of date)
> ACTUAL STDERR:
> /home/julianfoad/src/subversion-trunk3/subversion/libsvn_client/commit.c:864: (apr_err=160013)
> svn: Commit failed (details follow):
> /home/julianfoad/src/subversion-trunk3/subversion/libsvn_fs_fs/tree.c:661: (apr_err=160013)
> svn: File not found: transaction '3-4', path '/A/I'
> ]]]
>
>
> **********
>
> FAIL: merge_authz_tests.py 1: skipped paths get overriding mergeinfo
>
> This test is encountering a tree conflict. This test is mainly testing
> for skipped merge targets due to authz restriction, but it also (with
> its 'omega' path) tests for skipped merge targets due to a missing file.
> This is now a tree conflict scenario. I would favour removing this part
> of the test. It seems to be harder than just deleting a few lines,
> though.
>
>
> **********
- Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-05 20:02:03 CET