[SVN-3174] Merge algorithm chokes on subtrees needing special attention that have been renamed

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 1.5.x
• Fix Version/s: 1.5.1
• Component/s: libsvn_client
• Labels: merge-tracking
• Assignee: Unassigned
• Reporter: C. Michael Pilato
• Created: 16/Apr/08 15:04
• Updated: 27/Oct/18 16:33
• Resolved: 19/Jun/08 17:35

Description

As part of the investigation of issue #3067, code examination led me to wonder
how the merge algorithm handles a particular scenario.  Namely, when a subtree
that needs special attention (due to having different mergeinfo than its parent,
typically) has a rename in its history in the middle of the requested merge
range. I suspected the logic would suffer the same sorts of problems noticed in
issue #3067, and I think I was right.  I'll attach a recipe to demonstrate.