Merge lp://qastaging/~ubuntu-branches/ubuntu/lucid/squid/lucid-201002101821 into lp://qastaging/ubuntu/lucid/squid
Proposed by
James Westby
Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/lucid/squid/lucid-201002101821 |
Merge into: | lp://qastaging/ubuntu/lucid/squid |
Diff against target: |
231 lines (+180/-0) (has conflicts) 6 files modified
debian/changelog (+20/-0) debian/patches/90-cf.data.ubuntu.dpatch (+19/-0) debian/patches/99-fix-storeurl-move-temp.dpatch (+24/-0) debian/patches/99-squid-capability.dpatch (+43/-0) debian/rules (+4/-0) debian/squid.upstart (+70/-0) Text conflict in debian/changelog Conflict adding file debian/patches/90-cf.data.ubuntu.dpatch. Moved existing file to debian/patches/90-cf.data.ubuntu.dpatch.moved. Conflict adding file debian/patches/99-fix-storeurl-move-temp.dpatch. Moved existing file to debian/patches/99-fix-storeurl-move-temp.dpatch.moved. Conflict adding file debian/patches/99-squid-capability.dpatch. Moved existing file to debian/patches/99-squid-capability.dpatch.moved. Text conflict in debian/rules Conflict adding file debian/squid.upstart. Moved existing file to debian/squid.upstart.moved. |
To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/lucid/squid/lucid-201002101821 |
Related bugs: |
To post a comment you must log in.
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/squid now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/squid/lucid-201002101821. A merge should be performed if necessary.