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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntuone-client at revision 907

Facundo Batista (community): Approve on 2011-03-07

John O'Brien (community): Approve on 2011-03-07

Diff: 369 lines (+137/-27)

2 files modified

tests/syncdaemon/test_action_queue.py (+108/-11)
ubuntuone/syncdaemon/action_queue.py (+29/-16)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #718924: self conflict while saving the same file a lot

High

Fix Released

Link a bug report

Related blueprints

905. By Facundo Batista on 2011-03-04

Optional cancel

904. By Facundo Batista on 2011-03-02

Merged trunk in

903. By Guillermo Gonzalez on 2011-03-02

Fix the "progress wrapper" to handle the case of a resumed upload and inform the real progress.

902. By Facundo Batista on 2011-03-02

Support double cancellation (LP: #705231)

901. By Facundo Batista on 2011-02-28

Fixes related to hashing loops. (LP: #580855, LP: #701196)

900. By Facundo Batista on 2011-02-28

Resolved two situations that hung some commands (LP: #724058)

899. By Facundo Batista on 2011-02-28

Update DBus API for asking waiting operations.

898. By Manuel de la Peña on 2011-02-28

Implements the network manager that will execute callbacks when the status of the network changes.

897. By Manuel de la Peña on 2011-02-25

Adds the basic implementation of the remotes objects that will expose the DBus API found on Linux on Windows using twisted.pb.

896. By Facundo Batista on 2011-02-25

Fixed Trash and Move limbo regarding paths. (LP: #707576)