[SVN-4238] merge -cA,B with --accept option aborts if rA conflicts

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: trunk
• Fix Version/s: 1.8.0
• Component/s: unknown
• Assignee: Julian Foad
• Reporter: Stefan Sperling
• Created: 02/Oct/12 12:18
• Updated: 27/Oct/18 16:27
• Resolved: 29/Jan/13 22:56

Description

If multiple revisions are merged with the -c option, and an --accept option is
specified to auto-resolve conflicts, svn merge currently aborts the merge early
if one of the revisions conflicts. The merge should continue instead.