lp:~nataliabidart/ubuntuone-client/tree-deletion-when-prior-conflict

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntuone-client

Guillermo Gonzalez: Approve on 2010-03-16

Roman Yepishev (community): Approve on 2010-03-16

Diff: 262 lines (+102/-56)

4 files modified

contrib/testing/testcase.py (+24/-0)
tests/syncdaemon/test_fsm.py (+58/-22)
tests/syncdaemon/test_states.py (+1/-21)
ubuntuone/syncdaemon/filesystem_manager.py (+19/-13)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #462003: server-side tree deletion results in .u1conflict folders on clients.	Medium	Fix Released
Bug #494469: [FAIL] on test_warning_on_log_file_when_failing_delete at tests.syncdaemon.test_fsm.FileHandlingTests	High	Fix Released

Link a bug report

Related blueprints

433. By Natalia Bidart on 2010-03-15

Adding test case and code to correctly detect conflicted directories and avoid
tree deletion.

432. By Natalia Bidart on 2010-03-15

Restoring previous code to avoid diffs.

431. By Natalia Bidart on 2010-03-15

Using MementoHandler to assert over logs.

430. By Natalia Bidart on 2010-03-15

Fixing lint issues.

429. By Natalia Bidart on 2010-03-15

Added test case and fix for Bug #462003.

Added simple fix to pseudo-related Bug #494469.

428. By David Planella on 2010-03-15

Mark the Comment in the desktop entry for translation

427. By Facundo Batista on 2010-03-12

Changed a raise for a warning when HQ was used after shutdown.

426. By dobey on 2010-03-12

Grab the bin scripts in the lint wrapper
Fix the pyflakes complaints in the bin scripts

425. By Rodrigo Moya on 2010-03-12

Added live queries to the contacts picker and ability to add new contacts

424. By Facundo Batista on 2010-03-11

If we receive SYS_ROOT_MISMATCH, stuck in an error.