Merge lp://staging/~ubuntu-branches/ubuntu/natty/libdbusmenu/natty-201012091915 into lp://staging/ubuntu/natty/libdbusmenu
Proposed by
James Westby
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/natty/libdbusmenu/natty-201012091915 |
| Merge into: | lp://staging/ubuntu/natty/libdbusmenu |
| Diff against target: |
40 lines (+14/-0) (has conflicts) 2 files modified
debian/changelog (+10/-0) debian/control (+4/-0) Text conflict in debian/changelog Text conflict in debian/control |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/natty/libdbusmenu/natty-201012091915 |
| 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/libdbusmenu now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/libdbusmenu/natty-201012091915. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 46. By Martin Pitt
-
add bug number
- 45. By Sebastien Bacher
-
debian/control.in: don't build-depends on gir-repository-dev
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
