Merge lp:~ubuntu-branches/ubuntu/natty/dee/natty-201011231711 into lp:ubuntu/natty/dee
Proposed by
James Westby
Status: | Work in progress |
---|---|
Proposed branch: | lp:~ubuntu-branches/ubuntu/natty/dee/natty-201011231711 |
Merge into: | lp:ubuntu/natty/dee |
Diff against target: |
7 lines (+1/-0) (has conflicts) 1 file modified
debian/gir1.0-dee-1.0.install (+1/-0) Conflict adding file debian/gir1.0-dee-1.0.install. Moved existing file to debian/gir1.0-dee-1.0.install.moved. |
To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/natty/dee/natty-201011231711 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+41626@code.launchpad.net |
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/dee now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/dee/natty-201011231711. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 8. By Ken VanDine
-
releasing version 0.4.2-0ubuntu2