Merge lp://qastaging/~ubuntu-branches/ubuntu/lucid/cloud-utils/lucid-201002240310 into lp://qastaging/ubuntu/lucid/cloud-utils
Proposed by
James Westby
| Status: | Merged |
|---|---|
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/lucid/cloud-utils/lucid-201002240310 |
| Merge into: | lp://qastaging/ubuntu/lucid/cloud-utils |
| Diff against target: |
20 lines (+5/-0) (has conflicts) 1 file modified
debian/changelog (+5/-0) Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/lucid/cloud-utils/lucid-201002240310 |
| Related bugs: |
To post a comment you must log in.
Revision history for this message
| James Westby (james-w) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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/cloud-utils now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/cloud-utils/lucid-201002240310. A merge should be performed if necessary.