[SVN-3139] merge_tests.py 19 is XFail due to tree conflicts

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: trunk
• Fix Version/s: 1.6.0
• Component/s: tests
• Labels: tree-conflicts
• Assignee: Unassigned
• Reporter: Stefan Sperling
• Created: 26/Mar/08 21:35
• Updated: 27/Oct/18 16:35
• Resolved: 10/Mar/09 15:22

Description

merge_tests 19 ("merge should skip over unversioned obstructions") is
one of the tests that currently fail on the tree-conflicts branch.

Discussion about this has been started in this thread:
http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=136343

In that thread, I claimed that the test was failing because we
were now marking obstructed files during merge as tree conflicts.
However, it looks like I didn't analyze the situation correctly
before starting that thread.

Further investigation on my part suggests that we are currently having
trouble flagging obstructed files as tree-conflict victims! The details
are still unclear to me, however. I will investigate further and once
I'm really sure I know what I'm talking about, I'll append more
information to this issue.

http://svn.collab.net/repos/svn/branches/tree-conflicts

Issue Links

• blocks: SVN-3209 Tests XFAIL due to changed tree-conflicts behaviour
• blocks: SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts
• depends upon: SVN-3146 tree conflicts and obstructed files
• is blocked by: SVN-3146 tree conflicts and obstructed files
• is depended upon by: SVN-3209 Tests XFAIL due to changed tree-conflicts behaviour
• is depended upon by: SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts