Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 349848 - Merge doesn't remove empty folders
Summary: Merge doesn't remove empty folders
Status: RESOLVED FIXED
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: 1.0   Edit
Hardware: PC All
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL: http://egit.eclipse.org/r/3756
Whiteboard:
Keywords:
Depends on:
Blocks: 348135
  Show dependency tree
 
Reported: 2011-06-20 12:13 EDT by Tomasz Zarna CLA
Modified: 2011-07-13 09:51 EDT (History)
1 user (show)

See Also:

Attachments
mylyn/context/zip (2.71 KB, application/octet-stream)
2011-06-20 12:23 EDT, Tomasz Zarna CLA 		no flags Details
View All 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 Tomasz Zarna CLA 2011-06-20 12:13:18 EDT 
Steps:
1. Init a repo
2. Create two folders with 2 files in each of them
3. Commit 
4. Remove the folders
5. Commit
6. Checkout commit from 3.
7. Merge with master (commit from 5.)
=> SHOULD BE: the working dir should have no folders, they have been removed in 5.
=> IS: there is an empty folder
Comment 1 Tomasz Zarna CLA 2011-06-20 12:19:39 EDT 
http://egit.eclipse.org/r/3756
Comment 2 Tomasz Zarna CLA 2011-06-20 12:23:45 EDT 
Created attachment 198267 [details]
mylyn/context/zip
Comment 3 Stefan Lay CLA 2011-07-13 09:35:03 EDT 
Fixed with 35be5c6d46d8ba0ed2c7613a495de5f5af8ab30a
Comment 4 Stefan Lay CLA 2011-07-13 09:51:43 EDT 
Rebased commit: e15037b3c7aa7f72313f19086bce12c54617c1bb