Merge lp://staging/~ubuntu-branches/ubuntu/lucid/udisks/lucid-201003081616 into lp://staging/ubuntu/lucid/udisks
Proposed by
James Westby
| Status: | Merged |
|---|---|
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/lucid/udisks/lucid-201003081616 |
| Merge into: | lp://staging/ubuntu/lucid/udisks |
| Diff against target: |
36 lines (+10/-1) (has conflicts) 2 files modified
debian/changelog (+9/-0) debian/control (+1/-1) Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/lucid/udisks/lucid-201003081616 |
| 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/udisks now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/udisks/lucid-201003081616. A merge should be performed if necessary.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
