[SVN-2874] Make merge notifications to 'R' for Delete followed by Add

• Type: Bug
• Status: Closed
• Priority: Critical
• Resolution: Fixed
• Affects Version/s: trunk
• Fix Version/s: 1.5.0
• Component/s: libsvn_client
• Labels: merge-tracking
• Assignee: Unassigned
• Reporter: Daniel Rall
• Created: 17/Aug/07 18:11
• Updated: 27/Oct/18 16:36
• Resolved: 10/Mar/09 15:22

Description

The expected output for the scenario of:

1) Removing a directory and commiting the removal.
2) Coping another directory in place of the old directory and commiting that.
3) Performing a reverse merge to restore the initial directory.

... should be 'R ' (replace of the directory) rather than 'A ' (add of
the directory).

'revert_tests.py 17' started testing the correct expectation in r26136.

This problem was found on trunk (~1.5), but may exist in previous releases as well.

Issue Links

• blocks: SVN-2821 Improve merge algorithm used for target trees with child paths which have mergeinfo that differs from their parent's
• is depended upon by: SVN-2821 Improve merge algorithm used for target trees with child paths which have mergeinfo that differs from their parent's