Merge lp:~ubuntu-branches/ubuntu/natty/glib-networking/natty-201103311614 into lp:ubuntu/natty/glib-networking
Proposed by
James Westby
Status: | Merged |
---|---|
Merged at revision: | 7 |
Proposed branch: | lp:~ubuntu-branches/ubuntu/natty/glib-networking/natty-201103311614 |
Merge into: | lp:ubuntu/natty/glib-networking |
Diff against target: | 0 lines |
To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/natty/glib-networking/natty-201103311614 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Colin Watson | Approve | ||
Review via email: mp+55785@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/glib-networking now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/glib-networking/natty-201103311614. A merge should be performed if necessary.
To post a comment you must log in.
This branch has better history, but the contents don't quite match the archive due to an autogenerated debian/control file, so I'll merge this into the auto-import branch.