Merge lp://staging/~ubuntu-branches/ubuntu/maverick/kerneloops/maverick-201010010911 into lp://staging/ubuntu/maverick/kerneloops
Proposed by
James Westby
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/maverick/kerneloops/maverick-201010010911 |
| Merge into: | lp://staging/ubuntu/maverick/kerneloops |
| Diff against target: |
22 lines (+9/-0) (has conflicts) 1 file modified
debian/changelog (+9/-0) Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/maverick/kerneloops/maverick-201010010911 |
| Related bugs: |
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/maverick/kerneloops now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/kerneloops/maverick-201010010911. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 21. By James Westby
-
Fix destination in changelog.
- 20. By James Westby
-
Disable kerneloops for final release.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
