Merge lp://staging/~ubuntu-branches/ubuntu/oneiric/ubufox/oneiric-201106011111 into lp://staging/ubuntu/oneiric/ubufox

Proposed by James Westby
Status: Rejected
Rejected by: James Westby
Proposed branch: lp://staging/~ubuntu-branches/ubuntu/oneiric/ubufox/oneiric-201106011111
Merge into: lp://staging/ubuntu/oneiric/ubufox
Diff against target: 0 lines
To merge this branch: bzr merge lp://staging/~ubuntu-branches/ubuntu/oneiric/ubufox/oneiric-201106011111
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+63101@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/ubufox now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/ubufox/oneiric-201106011111. A merge should be performed if necessary.

To post a comment you must log in.

Unmerged revisions

56. By Chris Coulson

releasing version 0.9.1-0ubuntu2

55. By Chris Coulson

* Hard-code distro version to Natty for now to work around LP: #790617
  - update defaults/preferences/dist.js

Preview Diff

Empty

Subscribers

People subscribed via source and target branches

to all changes: