Merge lp:~dobey/ubuntuone-client/update-3-0 into lp:ubuntuone-client/stable-3-0
Proposed by
dobey
Status: | Merged | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | dobey | ||||||||||||||||||||
Approved revision: | 1196 | ||||||||||||||||||||
Merged at revision: | 1196 | ||||||||||||||||||||
Proposed branch: | lp:~dobey/ubuntuone-client/update-3-0 | ||||||||||||||||||||
Merge into: | lp:ubuntuone-client/stable-3-0 | ||||||||||||||||||||
Diff against target: |
78 lines (+23/-9) 2 files modified
tests/syncdaemon/test_sync.py (+15/-7) ubuntuone/syncdaemon/sync.py (+8/-2) |
||||||||||||||||||||
To merge this branch: | bzr merge lp:~dobey/ubuntuone-client/update-3-0 | ||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brian Curtin (community) | Approve | ||
Review via email: mp+116340@code.launchpad.net |
Commit message
Force a "reput from local" when the server_hash (that came in the delta) is ""
To post a comment you must log in.