Merge lp:~ubuntu-branches/ubuntu/maverick/libvirt/maverick-201009031018 into lp:ubuntu/maverick/libvirt
Proposed by
James Westby
Status: | Merged |
---|---|
Merged at revision: | 102 |
Proposed branch: | lp:~ubuntu-branches/ubuntu/maverick/libvirt/maverick-201009031018 |
Merge into: | lp:ubuntu/maverick/libvirt |
Diff against target: |
64 lines (+58/-0) (has conflicts) 1 file modified
debian/patches/9024-Explicitly-pass-uml_dir-argument-to-user-mode-linux.patch (+58/-0) Conflict adding file debian/patches/9024-Explicitly-pass-uml_dir-argument-to-user-mode-linux.patch. Moved existing file to debian/patches/9024-Explicitly-pass-uml_dir-argument-to-user-mode-linux.patch.moved. |
To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/maverick/libvirt/maverick-201009031018 |
Related bugs: |
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/maverick/libvirt now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/libvirt/maverick-201009031018. A merge should be performed if necessary.
To post a comment you must log in.