Merge lp://staging/~ubuntu-branches/ubuntu/oneiric/gdk-pixbuf/oneiric-201105060911 into lp://staging/ubuntu/oneiric/gdk-pixbuf
Proposed by
James Westby
| Status: | Rejected |
|---|---|
| Rejected by: | James Westby |
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/oneiric/gdk-pixbuf/oneiric-201105060911 |
| Merge into: | lp://staging/ubuntu/oneiric/gdk-pixbuf |
| Diff against target: |
95 lines (+62/-0) (has conflicts) 6 files modified
debian/clean (+5/-0) debian/libgdk-pixbuf2.0-0.install.in.OTHER (+4/-0) debian/libgdk-pixbuf2.0-0.postinst.in.OTHER (+39/-0) debian/libgdk-pixbuf2.0-0.postrm.in.OTHER (+11/-0) debian/libgdk-pixbuf2.0-0.triggers.in.OTHER (+2/-0) debian/libgdk-pixbuf2.0-dev.links.in.OTHER (+1/-0) Path conflict: <deleted> / debian/libgdk-pixbuf2.0-0.postrm.in Path conflict: <deleted> / debian/libgdk-pixbuf2.0-0.install.in Path conflict: <deleted> / debian/libgdk-pixbuf2.0-0.triggers.in Path conflict: <deleted> / debian/libgdk-pixbuf2.0-dev.links.in Path conflict: <deleted> / debian/libgdk-pixbuf2.0-0.postinst.in Conflict adding file debian/clean. Moved existing file to debian/clean.moved. Contents conflict in debian/libgdk-pixbuf2.0-0.install.in Contents conflict in debian/libgdk-pixbuf2.0-0.postinst.in Contents conflict in debian/libgdk-pixbuf2.0-0.postrm.in Contents conflict in debian/libgdk-pixbuf2.0-0.triggers.in Contents conflict in debian/libgdk-pixbuf2.0-dev.links.in Conflict adding files to debian/patches. Created directory. Conflict because debian/patches is not versioned, but has versioned children. Versioned directory. Contents conflict in debian/patches/series |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/oneiric/gdk-pixbuf/oneiric-201105060911 |
| 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/oneiric/gdk-pixbuf now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/gdk-pixbuf/oneiric-201105060911. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 28. By Steve Langasek
-
releasing version 2.23.3-0ubuntu2
- 27. By Steve Langasek
-
merge multiarch support
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
