lp://staging/~lucio.torre/ubuntuone-client/dont-reorder-deletes-stable
- Get this branch:
- bzr branch lp://staging/~lucio.torre/ubuntuone-client/dont-reorder-deletes-stable
Branch merges
- Guillermo Gonzalez: Approve
- John O'Brien (community): Approve
-
Diff: 53 lines (+8/-11)2 files modifiedtests/syncdaemon/test_sync.py (+7/-2)
ubuntuone/syncdaemon/sync.py (+1/-9)
- dobey (community): Needs Resubmitting
-
Diff: 500 lines (+418/-11) (has conflicts)3 files modifiednautilus/ubuntuone-nautilus.c (+410/-0)
tests/syncdaemon/test_sync.py (+7/-2)
ubuntuone/syncdaemon/sync.py (+1/-9)
Related bugs
Bug #645335: conflict in file that isn't changed locally | Critical | Fix Released |
Related blueprints
Branch information
Recent revisions
- 716. By Roman Yepishev
-
Reuse shared structure to avoid crashes due to referencing already released memory.
- 715. By John Lenton
-
correctly stringify http errors that occur in restclient (in another process), and fix the call to bus.get_object in the case of removing the current machine's token.
- 713. By Rodrigo Moya
-
Add syncdaemon_
authentication_ clear_token API for the music store to deal with invalid tokens - 712. By Rodrigo Moya
-
Add syncdaemon_
authentication_ clear_token API for the music store to deal with invalid tokens - 710. By Roman Yepishev
-
Use com.syncdaemon.
SyncDaemon. UniqueInstance name to check for existing instance of syncdaemon. - 709. By Guillermo Gonzalez
-
Fix a regression in VolumeManager, now it calls refresh_shares after server rescan.
- 708. By Rodrigo Moya
-
- Plug a memory leak that might be causing #617656
- Added contacts for users with no addressbooks are kept in memory correctly now
- Fixed syncdaemon_metadata_ get_is_ synced to work for post-generations folders
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/ubuntuone-client