[SVN-2828] Handle multiple merge notifications for single WC items

• Type: Improvement
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: trunk
• Fix Version/s: 1.5.0
• Component/s: libsvn_client
• Labels: bite-sized merge-tracking
• Assignee: Unassigned
• Reporter: Daniel Rall
• Created: 13/Jul/07 21:53
• Updated: 27/Oct/18 16:35
• Resolved: 10/Mar/09 15:22

Description

Handle multiple notifications for single WC items:

Output multiple notifications, but print divider lines
indicating the revisions range to which a set of notifications
applies.  This will require enhancing the notification API to
include enough context to indicate which revision range is
currently being merged.  Introduce a new type of "skipped"
notification for WC items which are already in conflict.

This item seems basically done, and just needs to be recorded in the specs.

Issue Links

• blocks: SVN-2831 Handle notifications resulting from a merge (e.g. skips, conflicts, multiple notifications)
• depends upon: SVN-2848 Differentiate single revision range reverse merge notifications
• is blocked by: SVN-2848 Differentiate single revision range reverse merge notifications
• is depended upon by: SVN-2831 Handle notifications resulting from a merge (e.g. skips, conflicts, multiple notifications)