[SVN-2821] Improve merge algorithm used for target trees with child paths which have mergeinfo that differs from their parent's

• Type: Task
• Status: Closed
• Priority: Blocker
• Resolution: Fixed
• Affects Version/s: ---
• Fix Version/s: 1.5.0
• Component/s: libsvn_client
• Labels: merge-tracking
• Assignee: Unassigned
• Reporter: Daniel Rall
• Created: 13/Jul/07 21:26
• Updated: 27/Oct/18 16:34
• Resolved: 10/Mar/09 15:22

Description

Improve merge algorithm used for target trees with child paths
that contain differing merge info, per Peter Lundblad's
suggestions.  See the following thread:
http://subversion.tigris.org/servlets/BrowseList?list=dev&by=thread&from=565086

http://subversion.tigris.org/servlets/BrowseList?list=dev&by=thread&from=565086

Issue Links

• depends upon: SVN-2876 Make subtree merge smarter enough by not to do series of merge on subtree that is eventually getting deleted at a later stage of merge.
• depends upon: SVN-2754 Can't merge to target with Added children with mergeinfo
• depends upon: SVN-2874 Make merge notifications to 'R' for Delete followed by Add
• is blocked by: SVN-2876 Make subtree merge smarter enough by not to do series of merge on subtree that is eventually getting deleted at a later stage of merge.
• is blocked by: SVN-2754 Can't merge to target with Added children with mergeinfo
• is blocked by: SVN-2874 Make merge notifications to 'R' for Delete followed by Add