Merge lp://qastaging/~ubuntu-branches/ubuntu/natty/upstart/natty-201012141812 into lp://qastaging/ubuntu/natty/upstart
Proposed by
James Westby
| Status: | Merged |
|---|---|
| Merged at revision: | 1290 |
| Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/natty/upstart/natty-201012141812 |
| Merge into: | lp://qastaging/ubuntu/natty/upstart |
| Diff against target: |
2976 lines (+2255/-712) (has conflicts) 2 files modified
debian/changelog (+1433/-712) po/upstart.pot.OTHER (+822/-0) Text conflict in debian/changelog Contents conflict in po/upstart.pot |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/natty/upstart/natty-201012141812 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | 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/natty/upstart now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/upstart/natty-201012141812. 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
