Merge lp://staging/~ubuntu-branches/ubuntu/natty/gobject-introspection/natty-201101211713 into lp://staging/ubuntu/natty/gobject-introspection
Proposed by
James Westby
| Status: | Merged |
|---|---|
| Merged at revision: | 37 |
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/natty/gobject-introspection/natty-201101211713 |
| Merge into: | lp://staging/ubuntu/natty/gobject-introspection |
| Diff against target: |
292 lines (+281/-0) (has conflicts) 2 files modified
debian/patches/0001-Preserve-the-c-type-of-array-elements.patch (+280/-0) debian/patches/series (+1/-0) Conflict adding file debian/patches. Moved existing file to debian/patches.moved. |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/natty/gobject-introspection/natty-201101211713 |
| 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/gobject-introspection now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/gobject-introspection/natty-201101211713. 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
