lp:~nataliabidart/ubuntuone-client/conflict-only-when-needed
Created by
Natalia Bidart
and last modified
- Get this branch:
- bzr branch lp:~nataliabidart/ubuntuone-client/conflict-only-when-needed
Only
Natalia Bidart
can upload to this branch. If you are
Natalia Bidart
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Nicola Larosa (community): Approve
- Tim Cole (community): Approve
-
Diff: 521 lines (+284/-41)2 files modifiedtests/syncdaemon/test_fsm.py (+208/-30)
ubuntuone/syncdaemon/filesystem_manager.py (+76/-11)
Related bugs
Related blueprints
Branch information
Recent revisions
- 282. By Natalia Bidart
-
Making test and code for dir tree removal to proper delete all metadata
for its children and itself. - 280. By Natalia Bidart
-
Adding tests to ensure that no warning is logged when removing non empty directory.
- 279. By Natalia Bidart
-
Fix for #462003.
The check for dirtiness during the changed() calls was dropped since it
will need the sync module to have a delete_file deferred implementation. - 275. By Guillermo Gonzalez
-
Fix syncdaemon Config class to read parsed values, and write plain strings
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntuone-client