[SVN-2831] Handle notifications resulting from a merge (e.g. skips, conflicts, multiple notifications)

• 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: Daniel Rall
• Created: 13/Jul/07 22:02
• Updated: 27/Oct/18 16:34
• Resolved: 10/Mar/09 15:22

Description

Handle notifications resulting from a merge, including:

* Multiple notifications for single WC items (issue 2828)

* Skips (issue 2829)

* Conflicts (issue 2830)

This is an umbrella issue.

Issue Links

• depends upon: SVN-2997 If skipped paths come first in operative merge mergeinfo is incomplete
• depends upon: SVN-2830 Improve behavior when single-file conflicts are encountered during a merge
• depends upon: SVN-2828 Handle multiple merge notifications for single WC items
• depends upon: SVN-2829 Improve handling for skipped paths encountered during a merge
• is blocked by: SVN-2997 If skipped paths come first in operative merge mergeinfo is incomplete
• is blocked by: SVN-2830 Improve behavior when single-file conflicts are encountered during a merge
• is blocked by: SVN-2828 Handle multiple merge notifications for single WC items
• is blocked by: SVN-2829 Improve handling for skipped paths encountered during a merge