Merge lp:~chipaca/ubuntuone-client/improv-v2-upgrade into lp:ubuntuone-client
Proposed by
John Lenton
Status: | Merged |
---|---|
Approved by: | Guillermo Gonzalez |
Approved revision: | 188 |
Merged at revision: | not available |
Proposed branch: | lp:~chipaca/ubuntuone-client/improv-v2-upgrade |
Merge into: | lp:ubuntuone-client |
Diff against target: | None lines |
To merge this branch: | bzr merge lp:~chipaca/ubuntuone-client/improv-v2-upgrade |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Guillermo Gonzalez | Approve | ||
Eric Casteleijn (community) | Approve | ||
Review via email: mp+10805@code.launchpad.net |
Commit message
fixes #405688
To post a comment you must log in.
This fixes #405688, by being a lot more cautious in moving around conflicts and partials. If anybody can think of more cases for the tests, please let me know :)