Merge lp://staging/~verterok/ubuntuone-client/fix-597870 into lp://staging/ubuntuone-client
Proposed by
Guillermo Gonzalez
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | dobey | ||||
| Approved revision: | 555 | ||||
| Merged at revision: | 558 | ||||
| Proposed branch: | lp://staging/~verterok/ubuntuone-client/fix-597870 | ||||
| Merge into: | lp://staging/ubuntuone-client | ||||
| Diff against target: |
162 lines (+108/-5) 2 files modified
tests/syncdaemon/test_fsm.py (+90/-2) ubuntuone/syncdaemon/filesystem_manager.py (+18/-3) |
||||
| To merge this branch: | bzr merge lp://staging/~verterok/ubuntuone-client/fix-597870 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| dobey (community) | Approve | ||
| John O'Brien (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fix fileystem manager _delete_dir_tree method to support read-only shares.
Description of the change
Fix fileystem manager _delete_dir_tree method to support read-only shares.
This will avoid conflicts in read only shares, when a lot of changes are going on and e.g: we get a delete for a node and another node(s) are added to the parent.
To post a comment you must log in.
Revision history for this message
| dobey (dobey) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
looks good. tests pass