Merge lp:~ubuntu-branches/ubuntu/lucid/apt/lucid-proposed-201105300618 into lp:ubuntu/lucid-proposed/apt
Proposed by
James Westby
| Status: | Rejected |
|---|---|
| Rejected by: | Martin Pitt |
| Proposed branch: | lp:~ubuntu-branches/ubuntu/lucid/apt/lucid-proposed-201105300618 |
| Merge into: | lp:ubuntu/lucid-proposed/apt |
| To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/lucid/apt/lucid-proposed-201105300618 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Development Team | Pending | ||
|
Review via email:
|
|||
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/lucid-proposed/apt now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/apt/lucid-proposed-201105300618. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 114. By Michael Vogt
-
releasing version 0.7.25.3ubuntu9.5
- 113. By Michael Vogt
-
Backport r1327.24.434, 1327.24.437, 1327.76.1 (LP: #787500)
- 112. By Michael Vogt
-
import debdiff for #709895, thanks to Loic
- 111. By Michael Vogt
-
merged from lp:~ubuntu-branches/ubuntu/lucid/apt/lucid-updates-201105042235 and resolved conflict
