Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 320845 - Resolve Tree Conflict - Accept Incoming Changes doesn't work for directories
Summary: Resolve Tree Conflict - Accept Incoming Changes doesn't work for directories
Status: CLOSED MOVED
Alias: None
Product: Subversive
Classification: Technology
Component: Core (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows XP
: P3 major (vote)
Target Milestone: ---   Edit
Assignee: Igor Burilo CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-07-25 09:23 EDT by Seva Lapsha CLA
Modified: 2023-02-13 10:55 EST (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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.