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
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_tests.py 57: merge should merge mergeinfo
This test is encountering a tree conflict.
[[[
CMD: svn merge -r2:1 svn://.../A/B .../A/C
--- Reverse-merging r2 into 'svn-test-work/working_copies/merge_tests-57/A/C':
C svn-test-work/working_copies/merge_tests-57/A/C/J
Summary of conflicts:
Tree conflicts: 1
=============================================================
Expected 'J' and actual 'J' in output tree are different!
EXPECTED NODE TO BE:
Attributes: {'status': 'D '}
ACTUAL NODE FOUND:
Attributes: {'status': ' ', 'treeconflict': 'C'}
]]]
**********
FAIL: merge_tests.py 123: no self referential filtering on added path
This test is encountering a tree conflict.
[[[
CMD: svn merge svn://.../A .../A_COPY_2
--- Merging r3 through r10 into 'svn-test-work/working_copies/merge_tests-123/A_COPY_2':
U svn-test-work/working_copies/merge_tests-123/A_COPY_2/B/E/beta
C svn-test-work/working_copies/merge_tests-123/A_COPY_2/C
U svn-test-work/working_copies/merge_tests-123/A_COPY_2/D/G/rho
U svn-test-work/working_copies/merge_tests-123/A_COPY_2/D/H/omega
U svn-test-work/working_copies/merge_tests-123/A_COPY_2/D/H/psi
A svn-test-work/working_copies/merge_tests-123/A_COPY_2/C_MOVED
U svn-test-work/working_copies/merge_tests-123/A_COPY_2
Summary of conflicts:
Tree conflicts: 1
=============================================================
Expected 'C' and actual 'C' in output tree are different!
EXPECTED NODE TO BE:
Attributes: {'status': 'D '}
ACTUAL NODE FOUND:
Attributes: {'status': ' ', 'treeconflict': 'C'}
]]]
**********
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.
**********
FAIL: revert_tests.py 17: status after replace+, revert, and local rm
This looks like tree conflict handling has turned a "Replaced"
notification into a "Conflict" notification for the delete half plus an
"Add" notification for the add half of the replacement.
[[[
CMD: svn merge -r3:1 ...
--- Reverse-merging r3 through r2 into 'svn-test-work/working_copies/revert_tests-17/A/D/G':
C svn-test-work/working_copies/revert_tests-17/A/D/G
A svn-test-work/working_copies/revert_tests-17/A/D/G
A svn-test-work/working_copies/revert_tests-17/A/D/G/pi
A svn-test-work/working_copies/revert_tests-17/A/D/G/rho
A svn-test-work/working_copies/revert_tests-17/A/D/G/tau
Summary of conflicts:
Tree conflicts: 1
=============================================================
Expected 'G' and actual 'G' in output tree are different!
EXPECTED NODE TO BE:
Attributes: {'status': 'R '}
ACTUAL NODE FOUND:
Attributes: {'status': 'A '}
]]]
**********
- 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-04 20:39:59 CET