Merge lp://qastaging/~ubuntu-branches/ubuntu/lucid/cloud-utils/lucid-201003302223 into lp://qastaging/ubuntu/lucid/cloud-utils
Proposed by
James Westby
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/lucid/cloud-utils/lucid-201003302223 |
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-201003302223 |
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/lucid/cloud-utils now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/cloud-utils/lucid-201003302223. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 12. By Dustin Kirkland <kirkland@x200>
-
merge