[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.

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

Description

Merge on parent having subtree with differing mergeinfo which is getting deleted
by the current merge fails.

Expected behaviour.
Subtree should be deleted.
Actual behaviour,
../subversion/libsvn_fs_fs/tree.c:633: (apr_err=160013)
svn: File not found: revision 8, path '/A/D/gamma'

As a part of this change it is nice to skip any prior subtree merges and just
delete it as recommended by Peter lundblad's proposal
http://subversion.tigris.org/servlets/BrowseList?list=dev&by=thread&from=565086

Original issue reported by kameshj

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