Ubuntu One Client

Merge lp://qastaging/~verterok/ubuntuone-client/fix-452682-stable into lp://qastaging/ubuntuone-client

  1. fix-452682-stable
  2. Merge into trunk
Proposed by Guillermo Gonzalez
Status: Rejected
Rejected by: Guillermo Gonzalez
Proposed branch: lp://qastaging/~verterok/ubuntuone-client/fix-452682-stable
Merge into: lp://qastaging/ubuntuone-client
Diff against target: 92 lines (+42/-0) (has conflicts)
3 files modified
tests/syncdaemon/test_sync.py (+25/-0)
tests/syncdaemon/test_vm.py (+13/-0)
ubuntuone/syncdaemon/volume_manager.py (+4/-0)
Text conflict in tests/syncdaemon/test_sync.py
Contents conflict in ubuntuone/syncdaemon/u1fsfsm.ods
To merge this branch: bzr merge lp://qastaging/~verterok/ubuntuone-client/fix-452682-stable
Reviewer Review Type Date Requested Status
Roman Yepishev (community) Needs Fixing
Joshua Hoover (community) ran branch and verified fix Approve
Review via email: mp+25558@code.qastaging.launchpad.net

Commit message

Fix 'Shared With Me' symlink if the target was changed and the link is broken.

Description of the change

Fix 'Shared With Me' symlink if the target was changed and the link is broken.

To post a comment you must log in.
Revision history for this message
Joshua Hoover (joshuahoover) wrote :

Passed test in bug #452682.

review: Approve (ran branch and verified fix)
Revision history for this message
Roman Yepishev (rye) wrote :

Patched local stable install and tested it - works fine.

review: Approve
Revision history for this message
Roman Yepishev (rye) wrote :

But I believe the branch should be updated first to get rid of conflicts

review: Needs Fixing
Revision history for this message
Guillermo Gonzalez (verterok) wrote :

Hi Roman, I made a mistake while doing the merge proposal, the branch should target stable-1-2 instead of trunk, I'll submit a new merge proposal

Thanks!

Unmerged revisions

509. By Guillermo Gonzalez

check if the symlink target is the shares dir instead if it exists.

508. By Guillermo Gonzalez

fix 'Shared With Me' symlink if the target is deleted/changed and is broken.

507. By Facundo Batista

Support FS_FILE_CREATE while having the file in LOCAL.

506. By dobey

[backport] r508
Use the correct MODAL flag to avoid AttributeError
Use a try/finally to destroy the dialog when closed

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches