Merge lp://staging/~darkxst/ubuntu/utopic/ubiquity/lp1318621 into lp://staging/ubiquity

Proposed by Tim Lunn
Status: Merged
Merged at revision: 6237
Proposed branch: lp://staging/~darkxst/ubuntu/utopic/ubiquity/lp1318621
Merge into: lp://staging/ubiquity
Diff against target: 35 lines (+10/-7)
2 files modified
debian/changelog (+8/-0)
scripts/plugininstall.py (+2/-7)
To merge this branch: bzr merge lp://staging/~darkxst/ubuntu/utopic/ubiquity/lp1318621
Reviewer Review Type Date Requested Status
Ubuntu Installer Team Pending
Review via email: mp+219282@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

(a) i cannot merge this as the branch does not appear to be based on lp:ubiquity and even though the diff looks sane I'm getting:
bzr: ERROR: Revision {<email address hidden>} not present in "Graph(StackedParentsProvider(bzrlib.repository._LazyListJoin(([CachingParentsProvider(None)], []))))".

(b) the patch looks correct so I will apply it by hand.

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

to status/vote changes: