[SVN-3142] merge_tests.py 68 fails on tree-conflicts branch

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Duplicate
• Affects Version/s: trunk
• Fix Version/s: ---
• Component/s: tests
• Labels: tree-conflicts
• Assignee: Unassigned
• Reporter: Stefan Sperling
• Created: 26/Mar/08 21:45
• Updated: 27/Oct/18 16:36
• Resolved: 28/May/08 19:21

Description

Merge test 68 is one of the tests that currently fail on the tree-conflicts branch.

FAIL:  merge_tests.py 68: mergeinfo recording in skipped merge

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

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

Issue Links

• blocks: SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts
• duplicates: 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