Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 320844

Summary: Tree Conflicts are not shown in Merge View after Revert if Tree Conflicts resolved previously
Product: [Technology] Subversive Reporter: Seva Lapsha <seva.lapsha>
Component: CoreAssignee: Igor Burilo <igor.burilo>
Status: CLOSED MOVED QA Contact:
Severity: normal    
Priority: P3 CC: ganoro
Version: unspecified   
Target Milestone: ---   
Hardware: PC   
OS: Windows XP   
Whiteboard:

Description Seva Lapsha CLA 2010-07-25 09:18:20 EDT 
Steps to reproduce:

1. Create tree conflicts between branch 1 and 2.
2. Merge from branch 2 to branch 1.
3. Resolve tree conflicts.
4. Revert all changes.
5. Merge again.

Result:

1. No tree conflicts are shown at Merge View (but they still exist)
2. An "Operation Failed: Synchronization operation failed" dialog is shown with message:

Merge status operation failed.
svn: Attempt to add tree conflict that already exists
Comment 1 Eclipse Webmaster CLA 2023-02-13 10:55:12 EST 
This issue has been migrated to https://gitlab.eclipse.org/eclipse/subversive/subversive/-/issues/66.