Some tests are failing on the tree-conflicts branch because they have not been
adjusted to expect the new tree-conflict handling. Presently:
FAIL: checkout_tests.py 13: co handles obstructing paths scheduled for add
FAIL: update_tests.py 14: update missing dir to rev in which it is absent
FAIL: update_tests.py 15: another "hudson" problem: updates that delete
FAIL: update_tests.py 31: forced up fails with some types of obstructions
FAIL: update_tests.py 33: update wc containing a replaced-with-history file
FAIL: update_tests.py 34: update handles obstructing paths scheduled for add
FAIL: switch_tests.py 21: forced switch fails with some types of obstuctions
FAIL: switch_tests.py 24: switch tolerates WC adds
.. plus some tests in "merge_tests.py" that cause tree conflicts, that I have
made XFail for now.
We need to see which tests simply need to be updated and whether any of the
failures indicate bugs that we need to fix.
Many of these are to do with obstructions, which is a part of the behaviour
that's not yet well defined, so bear in mind that we may need to define what we
want to happen in some cases as well as simply "fixing" them.
Bug
Major
SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts