Merge lp://staging/~mikemc/ubuntuone-ios-files/ignore-null-sized-nodes into lp://staging/ubuntuone-ios-files

Proposed by Mike McCracken
Status: Merged
Approved by: dobey
Approved revision: 102
Merged at revision: 105
Proposed branch: lp://staging/~mikemc/ubuntuone-ios-files/ignore-null-sized-nodes
Merge into: lp://staging/ubuntuone-ios-files
Prerequisite: lp://staging/~mikemc/ubuntuone-ios-files/quiet-crashlytics
Diff against target: 15 lines (+5/-0)
1 file modified
Files/U1FilesClient.m (+5/-0)
To merge this branch: bzr merge lp://staging/~mikemc/ubuntuone-ios-files/ignore-null-sized-nodes
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+164777@code.staging.launchpad.net

Commit message

- Match android app behavior by ignoring nodes with null size

Description of the change

- Match android app behavior by ignoring nodes with null size

Later display code in folderviewcontroller wasn't handling this cleanly anyway.

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

6 -// Copyright 2011 Canonical Ltd.
7 +// Copyright 2013 Canonical Ltd.

Again with 2011-2013 instead. And this also seems to have a lot of the same changes as the quiet-crashlytics and separate-hasher branches.

review: Needs Fixing
Revision history for this message
Mike McCracken (mikemc) wrote :

r 101..102 fix criss-cross merge issues

Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

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