lp:~facundo/ubuntuone-client/fix-svfilenew-conflict

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntuone-client at revision 938

Guillermo Gonzalez: Approve on 2011-04-06

Lucio Torre (community): Approve on 2011-04-04

Diff: 293 lines (+136/-43)

4 files modified

contrib/dump_metadata.py (+4/-3)
tests/syncdaemon/test_sync.py (+89/-0)
ubuntuone/syncdaemon/sync.py (+34/-5)
ubuntuone/syncdaemon/u1fsfsm.py (+9/-35)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #711389: New file from server is ok if local file is the same one

Critical

Fix Released

Link a bug report

Related blueprints

926. By Facundo Batista on 2011-04-04

Fixes 711389

925. By Facundo Batista on 2011-04-04

Support SV_FILE_NEW when having a node for that path

924. By Facundo Batista on 2011-04-04

Added new param to trash

923. By Facundo Batista on 2011-04-04

Trunk merged in

922. By dobey on 2011-03-18

[release] 1.5.7 ubuntuone-client

921. By Eric Casteleijn on 2011-03-18

Remove all notifications of connection made/lost events.

920. By Alejandro J. Cura on 2011-03-17

Zeitgeist listener now assumes nodes are already gone when handling delete events (LP: #693545 and LP: #692730)

919. By Guillermo Gonzalez on 2011-03-15

Fix Upload command to use the upload_id if the command was paused (possibly due to a connection failure) and it's being restarted.

918. By Eric Casteleijn on 2011-03-14

This makes the code use a single instance of the ubuntuone.platform.notification.Notification class.

917. By Eric Casteleijn on 2011-03-10

fixes bug #732431: a callback was called with the wrong signature, and no tests exercised it. Both are fixed now.