Merge lp://staging/~ubuntu-branches/ubuntu/oneiric/system-config-printer/oneiric-201105061812 into lp://staging/ubuntu/oneiric/system-config-printer

Proposed by James Westby
Status: Rejected
Rejected by: James Westby
Proposed branch: lp://staging/~ubuntu-branches/ubuntu/oneiric/system-config-printer/oneiric-201105061812
Merge into: lp://staging/ubuntu/oneiric/system-config-printer
Diff against target: 0 lines
To merge this branch: bzr merge lp://staging/~ubuntu-branches/ubuntu/oneiric/system-config-printer/oneiric-201105061812
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+60227@code.staging.launchpad.net

Description of the change

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/oneiric/system-config-printer now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/system-config-printer/oneiric-201105061812. A merge should be performed if necessary.

To post a comment you must log in.

Unmerged revisions

178. By Till Kamppeter

debian/patches/70_udev-configure-printer-dont-crash-on-bad-ipp-answer.patch:
Be more defensive when parsing CUPS responses (LP: #760661).

Preview Diff

Empty

Subscribers

People subscribed via source and target branches

to all changes: