Merge lp://staging/~brian-murray/apt/history-log into lp://staging/~ubuntu-core-dev/apt/ubuntu
Proposed by
Brian Murray
| Status: | Merged |
|---|---|
| Merge reported by: | Michael Vogt |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~brian-murray/apt/history-log |
| Merge into: | lp://staging/~ubuntu-core-dev/apt/ubuntu |
| Diff against target: |
389383 lines (+386902/-0) (has conflicts) 480 files modified
.bzr-builddeb/default.conf (+2/-0) AUTHORS (+64/-0) BUGS (+9/-0) COMPILING (+85/-0) COPYING (+23/-0) COPYING.GPL (+340/-0) Makefile (+34/-0) README.MultiArch (+63/-0) README.ddtp (+74/-0) README.make (+112/-0) README.progress-reporting (+69/-0) abicheck/abi-compliance-checker.pl (+7325/-0) abicheck/apt_build.xml.in (+11/-0) abicheck/apt_installed.xml.in (+11/-0) abicheck/run_abi_test (+14/-0) aclocal.m4 (+2378/-0) apt-inst/contrib/arfile.cc (+152/-0) apt-inst/contrib/arfile.h (+66/-0) apt-inst/contrib/extracttar.cc (+349/-0) apt-inst/contrib/extracttar.h (+55/-0) apt-inst/database.cc (+26/-0) apt-inst/database.h (+52/-0) apt-inst/deb/debfile.cc (+294/-0) apt-inst/deb/debfile.h (+89/-0) apt-inst/deb/dpkgdb.cc (+490/-0) apt-inst/deb/dpkgdb.h (+50/-0) apt-inst/dirstream.cc (+116/-0) apt-inst/dirstream.h (+58/-0) apt-inst/dpkg-diffs.txt (+5/-0) apt-inst/extract.cc (+507/-0) apt-inst/extract.h (+50/-0) apt-inst/filelist.cc (+587/-0) apt-inst/filelist.h (+312/-0) apt-inst/makefile (+34/-0) apt-pkg/acquire-item.cc (+2077/-0) apt-pkg/acquire-item.h (+1023/-0) apt-pkg/acquire-method.cc (+511/-0) apt-pkg/acquire-method.h (+102/-0) apt-pkg/acquire-worker.cc (+611/-0) apt-pkg/acquire-worker.h (+322/-0) apt-pkg/acquire.cc (+919/-0) apt-pkg/acquire.h (+782/-0) apt-pkg/algorithms.cc (+1466/-0) apt-pkg/algorithms.h (+138/-0) apt-pkg/aptconfiguration.cc (+459/-0) apt-pkg/aptconfiguration.h (+118/-0) apt-pkg/cachefile.cc (+184/-0) apt-pkg/cachefile.h (+76/-0) apt-pkg/cachefilter.cc (+54/-0) apt-pkg/cachefilter.h (+29/-0) apt-pkg/cacheiterators.h (+441/-0) apt-pkg/cacheset.cc (+511/-0) apt-pkg/cacheset.h (+389/-0) apt-pkg/cdrom.cc (+948/-0) apt-pkg/cdrom.h (+115/-0) apt-pkg/clean.cc (+119/-0) apt-pkg/clean.h (+28/-0) apt-pkg/contrib/cdromutl.cc (+267/-0) apt-pkg/contrib/cdromutl.h (+24/-0) apt-pkg/contrib/cmndline.cc (+393/-0) apt-pkg/contrib/cmndline.h (+105/-0) apt-pkg/contrib/configuration.cc (+896/-0) apt-pkg/contrib/configuration.h (+137/-0) apt-pkg/contrib/crc-16.cc (+72/-0) apt-pkg/contrib/crc-16.h (+17/-0) apt-pkg/contrib/error.cc (+262/-0) apt-pkg/contrib/error.h (+322/-0) apt-pkg/contrib/fileutl.cc (+1046/-0) apt-pkg/contrib/fileutl.h (+127/-0) apt-pkg/contrib/hashes.cc (+126/-0) apt-pkg/contrib/hashes.h (+74/-0) apt-pkg/contrib/macros.h (+90/-0) apt-pkg/contrib/md5.cc (+359/-0) apt-pkg/contrib/md5.h (+77/-0) apt-pkg/contrib/mmap.cc (+444/-0) apt-pkg/contrib/mmap.h (+115/-0) apt-pkg/contrib/netrc.cc (+211/-0) apt-pkg/contrib/netrc.h (+29/-0) apt-pkg/contrib/progress.cc (+219/-0) apt-pkg/contrib/progress.h (+89/-0) apt-pkg/contrib/sha1.cc (+357/-0) apt-pkg/contrib/sha1.h (+67/-0) apt-pkg/contrib/sha256.cc (+424/-0) apt-pkg/contrib/sha256.h (+72/-0) apt-pkg/contrib/sptr.h (+66/-0) apt-pkg/contrib/strutl.cc (+1431/-0) apt-pkg/contrib/strutl.h (+145/-0) apt-pkg/contrib/weakptr.h (+64/-0) apt-pkg/deb/debindexfile.cc (+717/-0) apt-pkg/deb/debindexfile.h (+141/-0) apt-pkg/deb/deblistparser.cc (+867/-0) apt-pkg/deb/deblistparser.h (+79/-0) apt-pkg/deb/debmetaindex.cc (+429/-0) apt-pkg/deb/debmetaindex.h (+51/-0) apt-pkg/deb/debrecords.cc (+179/-0) apt-pkg/deb/debrecords.h (+54/-0) apt-pkg/deb/debsrcrecords.cc (+173/-0) apt-pkg/deb/debsrcrecords.h (+56/-0) apt-pkg/deb/debsystem.cc (+233/-0) apt-pkg/deb/debsystem.h (+43/-0) apt-pkg/deb/debversion.cc (+282/-0) apt-pkg/deb/debversion.h (+70/-0) apt-pkg/deb/dpkgpm.cc (+1507/-0) apt-pkg/deb/dpkgpm.h (+116/-0) apt-pkg/depcache.cc (+1800/-0) apt-pkg/depcache.h (+496/-0) apt-pkg/indexcopy.cc (+929/-0) apt-pkg/indexcopy.h (+104/-0) apt-pkg/indexfile.cc (+103/-0) apt-pkg/indexfile.h (+95/-0) apt-pkg/indexrecords.cc (+212/-0) apt-pkg/indexrecords.h (+59/-0) apt-pkg/init.cc (+170/-0) apt-pkg/init.h (+45/-0) apt-pkg/makefile (+58/-0) apt-pkg/metaindex.h (+51/-0) apt-pkg/orderlist.cc (+1117/-0) apt-pkg/orderlist.h (+117/-0) apt-pkg/packagemanager.cc (+714/-0) apt-pkg/packagemanager.h (+113/-0) apt-pkg/pkgcache.cc (+900/-0) apt-pkg/pkgcache.h (+693/-0) apt-pkg/pkgcachegen.cc (+1321/-0) apt-pkg/pkgcachegen.h (+181/-0) apt-pkg/pkgrecords.cc (+72/-0) apt-pkg/pkgrecords.h (+77/-0) apt-pkg/pkgsystem.cc (+44/-0) apt-pkg/pkgsystem.h (+94/-0) apt-pkg/policy.cc (+400/-0) apt-pkg/policy.h (+89/-0) apt-pkg/sourcelist.cc (+344/-0) apt-pkg/sourcelist.h (+100/-0) apt-pkg/srcrecords.cc (+132/-0) apt-pkg/srcrecords.h (+99/-0) apt-pkg/tagfile.cc (+609/-0) apt-pkg/tagfile.h (+124/-0) apt-pkg/vendor.cc (+35/-0) apt-pkg/vendor.h (+35/-0) apt-pkg/vendorlist.cc (+154/-0) apt-pkg/vendorlist.h (+50/-0) apt-pkg/version.cc (+40/-0) apt-pkg/version.h (+64/-0) apt-pkg/versionmatch.cc (+275/-0) apt-pkg/versionmatch.h (+78/-0) autom4te.cache/output.0 (+9260/-0) autom4te.cache/output.1 (+9260/-0) autom4te.cache/requests (+196/-0) autom4te.cache/traces.0 (+3504/-0) autom4te.cache/traces.1 (+624/-0) buildlib/apti18n.h.in (+28/-0) buildlib/config.h.in (+43/-0) buildlib/configure.mak (+35/-0) buildlib/copy.mak (+31/-0) buildlib/debiandoc.mak (+58/-0) buildlib/defaults.mak (+183/-0) buildlib/environment.mak.in (+69/-0) buildlib/fail.mak (+20/-0) buildlib/install-sh (+250/-0) buildlib/inttypes.h.in (+50/-0) buildlib/library.mak (+73/-0) buildlib/libversion.mak (+14/-0) buildlib/makefile.in (+51/-0) buildlib/manpage.mak (+29/-0) buildlib/mkChangeLog (+14/-0) buildlib/netdb.h.in (+6/-0) buildlib/po4a_manpage.mak (+64/-0) buildlib/podomain.mak (+22/-0) buildlib/program.mak (+60/-0) buildlib/python.mak (+68/-0) buildlib/sizetable (+25/-0) buildlib/staticlibrary.mak (+60/-0) buildlib/statvfs.h.in (+13/-0) buildlib/tools.m4 (+110/-0) cmdline/acqprogress.cc (+301/-0) cmdline/acqprogress.h (+37/-0) cmdline/apt-cache.cc (+1812/-0) cmdline/apt-cdrom.cc (+283/-0) cmdline/apt-config.cc (+135/-0) cmdline/apt-extracttemplates.cc (+392/-0) cmdline/apt-extracttemplates.h (+48/-0) cmdline/apt-get.cc (+3356/-0) cmdline/apt-key (+223/-0) cmdline/apt-mark (+101/-0) cmdline/apt-report-mirror-failure (+29/-0) cmdline/apt-sortpkgs.cc (+208/-0) cmdline/makefile (+68/-0) configure (+9260/-0) configure.in (+217/-0) debian/NEWS (+59/-0) debian/README.source (+6/-0) debian/apt-doc.doc-base.guide (+13/-0) debian/apt-doc.doc-base.offline (+13/-0) debian/apt-doc.docs (+2/-0) debian/apt-transport-https.README (+2/-0) debian/apt-transport-https.dirs (+1/-0) debian/apt-transport-https.install (+1/-0) debian/apt-utils.dirs (+2/-0) debian/apt-utils.examples (+1/-0) debian/apt-utils.install (+1/-0) debian/apt-utils.symbols (+121/-0) debian/apt.bug-script (+33/-0) debian/apt.conf.autoremove (+26/-0) debian/apt.conf.changelog (+6/-0) debian/apt.cron.daily (+517/-0) debian/apt.dirs (+16/-0) debian/apt.install (+5/-0) debian/apt.lintian-overrides (+3/-0) debian/apt.logrotate (+16/-0) debian/apt.postinst (+41/-0) debian/apt.symbols (+1303/-0) debian/changelog (+7357/-0) debian/compat (+1/-0) debian/control (+80/-0) debian/copyright (+23/-0) debian/libapt-pkg-dev.dirs (+2/-0) debian/libapt-pkg-dev.install (+3/-0) debian/libapt-pkg-doc.doc-base.design (+14/-0) debian/libapt-pkg-doc.doc-base.dpkg-tech (+13/-0) debian/libapt-pkg-doc.doc-base.files (+14/-0) debian/libapt-pkg-doc.doc-base.method (+14/-0) debian/postinst (+39/-0) debian/postrm (+22/-0) debian/preinst (+32/-0) debian/rules (+295/-0) debian/source/format (+1/-0) doc/Bugs (+174/-0) doc/Doxyfile.in (+1515/-0) doc/apt-cache.8.xml (+391/-0) doc/apt-cdrom.8.xml (+171/-0) doc/apt-config.8.xml (+119/-0) doc/apt-extracttemplates.1.xml (+87/-0) doc/apt-ftparchive.1.xml (+637/-0) doc/apt-get.8.xml (+606/-0) doc/apt-key.8.xml (+203/-0) doc/apt-mark.8.xml (+141/-0) doc/apt-secure.8.xml (+214/-0) doc/apt-sortpkgs.1.xml (+82/-0) doc/apt-verbatim.ent (+188/-0) doc/apt.8 (+52/-0) doc/apt.conf.5.xml (+1106/-0) doc/apt.ent (+210/-0) doc/apt_preferences.5.xml (+711/-0) doc/design.sgml (+411/-0) doc/dpkg-tech.sgml (+511/-0) doc/examples/apt-ftparchive.conf (+46/-0) doc/examples/apt-https-method-example.conf (+186/-0) doc/examples/apt.conf (+32/-0) doc/examples/configure-index (+458/-0) doc/examples/ftp-archive.conf (+81/-0) doc/examples/preferences (+11/-0) doc/examples/sources.list (+11/-0) doc/files.sgml (+345/-0) doc/guide.sgml (+547/-0) doc/lang.makefile (+11/-0) doc/libapt-pkg2_to_3.txt (+89/-0) doc/makefile (+108/-0) doc/manpage-style.xsl (+9/-0) doc/method.sgml (+354/-0) doc/offline.sgml (+236/-0) doc/po/apt-doc.pot (+8195/-0) doc/po/de.po (+11359/-0) doc/po/es.po (+11338/-0) doc/po/fr.po (+11330/-0) doc/po/it.po (+8559/-0) doc/po/ja.po (+10956/-0) doc/po/pl.po (+10219/-0) doc/po/pt.po (+11220/-0) doc/po/pt_BR.po (+8748/-0) doc/po4a.conf (+38/-0) doc/sources.list.5.xml (+242/-0) doc/style.txt (+75/-0) doc/xml.add (+5/-0) dselect/desc.apt (+9/-0) dselect/install (+110/-0) dselect/makefile (+17/-0) dselect/names (+1/-0) dselect/setup (+286/-0) dselect/update (+48/-0) ftparchive/apt-ftparchive.cc (+1012/-0) ftparchive/apt-ftparchive.h (+28/-0) ftparchive/cachedb.cc (+474/-0) ftparchive/cachedb.h (+137/-0) ftparchive/contents.cc (+394/-0) ftparchive/contents.h (+89/-0) ftparchive/makefile (+20/-0) ftparchive/multicompress.cc (+493/-0) ftparchive/multicompress.h (+67/-0) ftparchive/override.cc (+289/-0) ftparchive/override.h (+51/-0) ftparchive/writer.cc (+1095/-0) ftparchive/writer.h (+205/-0) methods/bzip2.cc (+172/-0) methods/cdrom.cc (+281/-0) methods/connect.cc (+245/-0) methods/connect.h (+20/-0) methods/copy.cc (+99/-0) methods/file.cc (+96/-0) methods/ftp.cc (+1124/-0) methods/ftp.h (+82/-0) methods/gpgv.cc (+262/-0) methods/gzip.cc (+120/-0) methods/http.cc (+1387/-0) methods/http.h (+199/-0) methods/http_main.cc (+20/-0) methods/https.cc (+336/-0) methods/https.h (+50/-0) methods/makefile (+116/-0) methods/mirror.cc (+436/-0) methods/mirror.h (+56/-0) methods/rfc2553emu.cc (+245/-0) methods/rfc2553emu.h (+113/-0) methods/rred.cc (+583/-0) methods/rsh.cc (+520/-0) methods/rsh.h (+70/-0) mirror-failure.py (+23/-0) po/ChangeLog (+1077/-0) po/LINGUAS (+1/-0) po/apt-all.pot (+3146/-0) po/ar.po (+3219/-0) po/ast.po (+3472/-0) po/bg.po (+3513/-0) po/bs.po (+3184/-0) po/ca.po (+3551/-0) po/cs.po (+3483/-0) po/cy.po (+3552/-0) po/da.po (+3430/-0) po/de.po (+3524/-0) po/dz.po (+3468/-0) po/el.po (+3468/-0) po/es.po (+4060/-0) po/eu.po (+3421/-0) po/fi.po (+3419/-0) po/fr.po (+3586/-0) po/gl.po (+3440/-0) po/he.po (+2840/-0) po/hu.po (+3458/-0) po/it.po (+3520/-0) po/ja.po (+3464/-0) po/km.po (+3423/-0) po/ko.po (+3400/-0) po/ku.po (+3193/-0) po/lt.po (+3309/-0) po/makefile (+94/-0) po/mr.po (+3439/-0) po/nb.po (+3511/-0) po/ne.po (+3430/-0) po/nl.po (+3481/-0) po/nn.po (+3459/-0) po/pl.po (+3467/-0) po/pt.po (+3648/-0) po/pt_BR.po (+3567/-0) po/ro.po (+3504/-0) po/ru.po (+3510/-0) po/sk.po (+3429/-0) po/sl.po (+3626/-0) po/sv.po (+3485/-0) po/th.po (+3408/-0) po/tl.po (+3505/-0) po/uk.po (+3498/-0) po/vi.po (+3475/-0) po/zh_CN.po (+3451/-0) po/zh_TW.po (+3365/-0) share/apt-auth-failure.note (+11/-0) test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Packages (+25/-0) test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release (+13/-0) test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release.gpg (+7/-0) test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages (+25/-0) test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release (+13/-0) test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg (+7/-0) test/authReliability/sources.list.failure (+2/-0) test/authReliability/sources.list.good (+2/-0) test/conf.cc (+37/-0) test/conf_clear.cc (+23/-0) test/extract-control.cc (+42/-0) test/fake-status (+16/-0) test/hash.cc (+70/-0) test/integration/Packages-bug-590438-broken-provides-thanks-to-remove-order (+67/-0) test/integration/Packages-bug-591882-conkeror (+1787/-0) test/integration/Packages-bug-593360-modifiers-in-names (+42/-0) test/integration/Packages-bug-598669-install-postfix-gets-exim-heavy (+30/-0) test/integration/Packages-bug-604222-new-and-autoremove (+68/-0) test/integration/Packages-bug-605394-versioned-or-groups (+71/-0) test/integration/Packages-bug-64141-install-dependencies-for-on-hold (+42/-0) test/integration/Packages-pdiff-usage (+34/-0) test/integration/Packages-pdiff-usage-new (+37/-0) test/integration/Packages-policy-pinning (+12/-0) test/integration/Packages-releasefile-verification (+18/-0) test/integration/Packages-releasefile-verification-new (+21/-0) test/integration/Packages-ubuntu-bug-614993 (+1819/-0) test/integration/Packages-xorg-break-providers (+52/-0) test/integration/create-test-data (+47/-0) test/integration/framework (+691/-0) test/integration/run-tests (+27/-0) test/integration/status-bug-590438-broken-provides-thanks-to-remove-order (+97/-0) test/integration/status-bug-591882-conkeror (+1357/-0) test/integration/status-bug-598669-install-postfix-gets-exim-heavy (+30/-0) test/integration/status-bug-601961-install-info (+42/-0) test/integration/status-bug-604222-new-and-autoremove (+10/-0) test/integration/status-bug-605394-versioned-or-groups (+34/-0) test/integration/status-bug-612557-garbage-upgrade (+34/-0) test/integration/status-bug-613420-new-garbage-dependency (+22/-0) test/integration/status-bug-64141-install-dependencies-for-on-hold (+33/-0) test/integration/status-ubuntu-bug-614993 (+5894/-0) test/integration/status-xorg-break-providers (+22/-0) test/integration/test-apt-get-autoremove (+51/-0) test/integration/test-apt-get-changelog (+36/-0) test/integration/test-apt-get-download (+29/-0) test/integration/test-bug-254770-segfault-if-cache-not-buildable (+57/-0) test/integration/test-bug-330162-encoded-tar-header (+11/-0) test/integration/test-bug-549968-install-depends-of-not-installed (+26/-0) test/integration/test-bug-590041-prefer-non-virtual-packages (+51/-0) test/integration/test-bug-590438-broken-provides-thanks-to-remove-order (+98/-0) test/integration/test-bug-591882-conkeror (+75/-0) test/integration/test-bug-593360-modifiers-in-names (+64/-0) test/integration/test-bug-595691-empty-and-broken-archive-files (+144/-0) test/integration/test-bug-598669-install-postfix-gets-exim-heavy (+19/-0) test/integration/test-bug-601016-description-translation (+92/-0) test/integration/test-bug-601961-install-info (+38/-0) test/integration/test-bug-604222-new-and-autoremove (+66/-0) test/integration/test-bug-604401-files-are-directories (+66/-0) test/integration/test-bug-605394-versioned-or-groups (+25/-0) test/integration/test-bug-611729-mark-as-manual (+84/-0) test/integration/test-bug-612099-multiarch-conflicts (+212/-0) test/integration/test-bug-612557-garbage-upgrade (+60/-0) test/integration/test-bug-612958-use-dpkg-multiarch-config (+59/-0) test/integration/test-bug-613420-new-garbage-dependency (+37/-0) test/integration/test-bug-618848-always-respect-user-requests (+32/-0) test/integration/test-bug-64141-install-dependencies-for-on-hold (+34/-0) test/integration/test-compressed-indexes (+132/-0) test/integration/test-disappearing-packages (+54/-0) test/integration/test-pdiff-usage (+45/-0) test/integration/test-policy-pinning (+228/-0) test/integration/test-release-candidate-switching (+419/-0) test/integration/test-releasefile-verification (+160/-0) test/integration/test-ubuntu-bug-365611-long-package-names (+11/-0) test/integration/test-ubuntu-bug-614993 (+59/-0) test/integration/test-xorg-break-providers (+43/-0) test/libapt/assert.h (+21/-0) test/libapt/commandlineasstring_test.cc (+39/-0) test/libapt/compareversion_test.cc (+123/-0) test/libapt/getarchitectures_test.cc (+61/-0) test/libapt/getlanguages_test.cc (+182/-0) test/libapt/getlistoffilesindir_test.cc (+82/-0) test/libapt/globalerror_test.cc (+109/-0) test/libapt/makefile (+48/-0) test/libapt/parsedepends_test.cc (+196/-0) test/libapt/run-tests (+66/-0) test/local-repo/Packages (+11/-0) test/local-repo/Release (+13/-0) test/local-repo/Release.gpg (+7/-0) test/makefile (+74/-0) test/mthdcat.cc (+20/-0) test/networkless-install-fixes/README (+5/-0) test/networkless-install-fixes/sources.test.list (+25/-0) test/networkless-install-fixes/test.sh (+25/-0) test/pre-upload-check.py (+266/-0) test/rpmver.cc (+117/-0) test/scratch.cc (+105/-0) test/test-indexes.sh (+235/-0) test/test_udevcdrom.cc (+19/-0) test/testdeb.cc (+39/-0) test/testextract.cc (+98/-0) test/testkeys/mvo.key (+1182/-0) test/testsources.list/sources.list.all-gpg-broken (+2/-0) test/testsources.list/sources.list.all-gpg-ok (+2/-0) test/testsources.list/sources.list.all-release-broken (+1/-0) test/testsources.list/sources.list.all-release-ok (+1/-0) test/testsources.list/sources.list.all-validuntil-broken (+1/-0) test/testsources.list/sources.list.md5-package-broken (+2/-0) test/testsources.list/sources.list.md5-package-ok (+2/-0) test/testsources.list/sources.list.md5-release-broken (+1/-0) test/testsources.list/sources.list.md5-release-ok (+1/-0) test/testsources.list/sources.list.sha1-release-broken (+1/-0) test/testsources.list/sources.list.sha1-release-ok (+1/-0) test/testsources.list/sources.list.sha256-package-broken (+2/-0) test/testsources.list/sources.list.sha256-package-ok (+2/-0) test/testsources.list/sources.list.sha256-release-broken (+1/-0) test/testsources.list/sources.list.sha256-release-ok (+1/-0) test/uri.cc (+34/-0) test/versions.lst (+106/-0) Conflict adding file .bzr-builddeb. Moved existing file to .bzr-builddeb.moved. Conflict adding file AUTHORS. Moved existing file to AUTHORS.moved. Conflict adding file BUGS. Moved existing file to BUGS.moved. Conflict adding file COMPILING. Moved existing file to COMPILING.moved. Conflict adding file COPYING.GPL. Moved existing file to COPYING.GPL.moved. Conflict adding file COPYING. Moved existing file to COPYING.moved. Conflict adding file Makefile. Moved existing file to Makefile.moved. Conflict adding file README.MultiArch. Moved existing file to README.MultiArch.moved. Conflict adding file README.ddtp. Moved existing file to README.ddtp.moved. Conflict adding file README.make. Moved existing file to README.make.moved. Conflict adding file README.progress-reporting. Moved existing file to README.progress-reporting.moved. Conflict adding file abicheck. Moved existing file to abicheck.moved. Conflict adding file apt-inst. Moved existing file to apt-inst.moved. Conflict adding file apt-pkg. Moved existing file to apt-pkg.moved. Conflict adding file buildlib. Moved existing file to buildlib.moved. Conflict adding file cmdline. Moved existing file to cmdline.moved. Conflict adding file configure.in. Moved existing file to configure.in.moved. Conflict adding file debian. Moved existing file to debian.moved. Conflict adding file doc. Moved existing file to doc.moved. Conflict adding file dselect. Moved existing file to dselect.moved. Conflict adding file ftparchive. Moved existing file to ftparchive.moved. Conflict adding file methods. Moved existing file to methods.moved. Conflict adding file mirror-failure.py. Moved existing file to mirror-failure.py.moved. Conflict adding file po. Moved existing file to po.moved. Conflict adding file share. Moved existing file to share.moved. Conflict adding file test. Moved existing file to test.moved. |
| To merge this branch: | bzr merge lp://staging/~brian-murray/apt/history-log |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Vogt (community) | Approve | ||
| Ubuntu Core Development Team | Pending | ||
|
Review via email:
|
|||
Description of the change
This branch adds in /var/log/
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
Thanks a bunch! I fixed a small typo and merged it. Please note that I couldn't merge directly as lp:ubuntu/apt does not point to lp:~ubuntu-core-dev/apt/ubuntu I need to figure out how to fix this.