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

Bug 320845

Summary: Resolve Tree Conflict - Accept Incoming Changes doesn't work for directories
Product: [Technology] Subversive Reporter: Seva Lapsha <seva.lapsha>
Component: CoreAssignee: Igor Burilo <igor.burilo>
Status: CLOSED MOVED QA Contact:
Severity: major    
Priority: P3 CC: ganoro
Version: unspecified   
Target Milestone: ---   
Hardware: PC   
OS: Windows XP   
Whiteboard:

Description Seva Lapsha CLA 2010-07-25 09:23:15 EDT 
State reproduction:

1. There is a Turnk.
2. Branch B1 created from Trunk.
3. Dir D added to Trunk.
4. Branch B1 merged from Trunk.
5. Branch B2 created from Trunk.
6. Merge from B1 to B2. -> Tree conflict on dir D (add, add).

Resolve Tree Conflict -> Apply incoming changes.

Result:

1. Dir D marked as deleted.
2. Dir D created inside D (marked as link).
3. Error shows up:

SVN: '0x00000227: Copy' operation finished with error: svn: Can't add 'D/D' to a parent directory scheduled for deletion
svn: Can't add 'D/D' to a parent directory scheduled for deletion
Comment 1 Eclipse Webmaster CLA 2023-02-13 10:55:14 EST 
This issue has been migrated to https://gitlab.eclipse.org/eclipse/subversive/subversive/-/issues/67.