Merge lp://qastaging/~ed.so/duplicity/remove_copyCom into lp://qastaging/~duplicity-team/duplicity/0.8-series
Proposed by
edso
| Status: | Merged |
|---|---|
| Merge reported by: | Kenneth Loafman |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~ed.so/duplicity/remove_copyCom |
| Merge into: | lp://qastaging/~duplicity-team/duplicity/0.8-series |
| Diff against target: |
55746 lines (+29684/-2223) (has conflicts) 171 files modified
CHANGELOG (+289/-53) Changelog.GNU (+281/-164) README (+5/-0) README-REPO (+53/-0) README-TESTING (+0/-138) bin/duplicity (+121/-20) bin/duplicity.1 (+17/-150) docs/duplicity.asyncscheduler.rst (+0/-7) docs/duplicity.backend.rst (+0/-7) docs/duplicity.backends.azurebackend.rst (+0/-7) docs/duplicity.backends.b2backend.rst (+0/-7) docs/duplicity.backends.botobackend.rst (+0/-7) docs/duplicity.backends.cfbackend.rst (+0/-7) docs/duplicity.backends.dpbxbackend.rst (+0/-7) docs/duplicity.backends.gdocsbackend.rst (+0/-7) docs/duplicity.backends.giobackend.rst (+0/-7) docs/duplicity.backends.hsibackend.rst (+0/-7) docs/duplicity.backends.hubicbackend.rst (+0/-7) docs/duplicity.backends.imapbackend.rst (+0/-7) docs/duplicity.backends.lftpbackend.rst (+0/-7) docs/duplicity.backends.localbackend.rst (+0/-7) docs/duplicity.backends.mediafirebackend.rst (+0/-7) docs/duplicity.backends.megabackend.rst (+0/-7) docs/duplicity.backends.multibackend.rst (+0/-7) docs/duplicity.backends.ncftpbackend.rst (+0/-7) docs/duplicity.backends.onedrivebackend.rst (+0/-7) docs/duplicity.backends.par2backend.rst (+0/-7) docs/duplicity.backends.pydrivebackend.rst (+0/-7) docs/duplicity.backends.rsyncbackend.rst (+0/-7) docs/duplicity.backends.swiftbackend.rst (+0/-7) docs/duplicity.backends.sxbackend.rst (+0/-7) docs/duplicity.backends.tahoebackend.rst (+0/-7) docs/duplicity.backends.webdavbackend.rst (+0/-7) docs/duplicity.collections.rst (+0/-7) docs/duplicity.commandline.rst (+0/-7) docs/duplicity.diffdir.rst (+0/-7) docs/duplicity.errors.rst (+0/-7) docs/duplicity.filechunkio.rst (+0/-7) docs/duplicity.globals.rst (+0/-7) docs/duplicity.globmatch.rst (+0/-7) docs/duplicity.gpg.rst (+0/-7) docs/duplicity.gpginterface.rst (+0/-7) docs/duplicity.lazy.rst (+0/-7) docs/duplicity.librsync.rst (+0/-7) docs/duplicity.log.rst (+0/-7) docs/duplicity.manifest.rst (+0/-7) docs/duplicity.patchdir.rst (+0/-7) docs/duplicity.path.rst (+0/-7) docs/duplicity.progress.rst (+0/-7) docs/duplicity.robust.rst (+0/-7) docs/duplicity.selection.rst (+0/-7) docs/duplicity.statistics.rst (+0/-7) docs/duplicity.tarfile.rst (+0/-7) docs/duplicity.tempdir.rst (+0/-7) docs/duplicity.util.rst (+0/-7) docs/testing.overrides.gettext.rst (+0/-7) docs/testing.overrides.rst (+0/-17) docs/testing.unit.rst (+0/-34) duplicity/_librsyncmodule.c (+1/-1) duplicity/backend.py (+30/-0) duplicity/backends/_cf_pyrax.py (+22/-0) duplicity/backends/acdclibackend.py.OTHER (+151/-0) duplicity/backends/azurebackend.py (+31/-1) duplicity/backends/b2backend.py (+104/-0) duplicity/backends/dpbxbackend.py (+49/-0) duplicity/backends/gdocsbackend.py (+6/-0) duplicity/backends/giobackend.py (+16/-0) duplicity/backends/hsibackend.py (+5/-0) duplicity/backends/hubicbackend.py (+4/-0) duplicity/backends/lftpbackend.py (+29/-0) duplicity/backends/localbackend.py (+6/-0) duplicity/backends/megabackend.py (+147/-0) duplicity/backends/multibackend.py (+14/-14) duplicity/backends/ncftpbackend.py (+5/-0) duplicity/backends/onedrivebackend.py (+4/-0) duplicity/backends/par2backend.py (+4/-0) duplicity/backends/pydrivebackend.py (+13/-0) duplicity/backends/rsyncbackend.py (+5/-0) duplicity/backends/ssh_paramiko_backend.py (+5/-0) duplicity/backends/ssh_pexpect_backend.py (+6/-0) duplicity/backends/swiftbackend.py (+7/-3) duplicity/backends/sxbackend.py (+4/-0) duplicity/backends/tahoebackend.py (+6/-0) duplicity/backends/webdavbackend.py (+27/-0) duplicity/collections.py (+102/-26) duplicity/commandline.py (+102/-8) duplicity/compilec.py (+4/-0) duplicity/diffdir.py (+10/-6) duplicity/dup_threading.py (+7/-0) duplicity/file_naming.py (+0/-8) duplicity/globals.py (+18/-3) duplicity/globmatch.py (+19/-3) duplicity/gpg.py (+31/-0) duplicity/gpginterface.py (+0/-1) duplicity/lazy.py (+37/-11) duplicity/log.py (+3/-0) duplicity/manifest.py (+18/-4) duplicity/patchdir.py (+15/-6) duplicity/progress.py (+8/-0) duplicity/robust.py (+4/-3) duplicity/selection.py (+72/-3) duplicity/statistics.py (+14/-8) duplicity/tarfile.py (+1/-1) duplicity/util.py (+20/-0) po/bg.po (+664/-20) po/bs.po (+747/-18) po/ca.po (+638/-14) po/ca@valencia.po (+638/-14) po/cs.po (+778/-15) po/de.po (+842/-18) po/duplicity.pot (+872/-11) po/el.po (+638/-14) po/en_AU.po (+841/-27) po/en_GB.po (+844/-27) po/eo.po (+638/-14) po/es.po (+813/-19) po/fi.po (+638/-14) po/fr.po (+789/-23) po/gl.po (+727/-23) po/he.po (+642/-14) po/hu.po (+737/-22) po/id.po (+745/-18) po/io.po (+637/-14) po/it.po (+760/-20) po/ja.po (+629/-17) po/km.po (+638/-14) po/ms.po (+774/-24) po/nb.po (+690/-20) po/nl.po (+638/-14) po/oc.po (+653/-14) po/pl.po (+720/-24) po/pt.po (+666/-16) po/pt_BR.po (+759/-24) po/ru.po (+756/-30) po/sl.po (+776/-20) po/sq.po (+638/-14) po/sr.po (+640/-14) po/sv.po (+805/-41) po/tr.po (+664/-14) po/ug.po (+646/-14) po/uk.po (+764/-18) po/zh_CN.po (+712/-12) requirements.txt (+13/-0) setup.py (+10/-12) testing/__init__.py (+8/-1) testing/functional/test_selection.py (+8/-1) testing/gnupg/gpg-agent.conf (+0/-3) testing/gnupg/gpg.conf (+0/-9) testing/infrastructure/.env (+0/-28) testing/infrastructure/build-duplicity_test.sh (+0/-21) testing/infrastructure/check_docker_container.sh (+0/-64) testing/infrastructure/docker-compose.yml (+0/-75) testing/infrastructure/duplicity_test/Dockerfile (+0/-81) testing/infrastructure/ftp_server/Dockerfile (+0/-32) testing/infrastructure/ftp_server/pureftpd.passwd (+0/-1) testing/infrastructure/id_rsa (+0/-27) testing/infrastructure/id_rsa.pub (+0/-1) testing/infrastructure/setup.sh (+0/-27) testing/infrastructure/ssh_server/Dockerfile (+0/-65) testing/infrastructure/teardown.sh (+0/-26) testing/test_code.py (+27/-0) testing/unit/test_collections.py (+43/-5) testing/unit/test_diffdir.py (+39/-8) testing/unit/test_dup_time.py (+8/-0) testing/unit/test_globmatch.py (+229/-0) testing/unit/test_gpg.py (+2/-2) testing/unit/test_gpginterface.py (+24/-0) testing/unit/test_lazy.py (+11/-0) testing/unit/test_manifest.py (+23/-1) testing/unit/test_selection.py (+55/-0) tox.ini (+36/-1) Text conflict in CHANGELOG Text conflict in Changelog.GNU Text conflict in README Text conflict in bin/duplicity Text conflict in bin/duplicity.1 Conflict: can't delete docs because it is not empty. Not deleting. Conflict because docs is not versioned, but has versioned children. Versioned directory. Contents conflict in docs/Makefile Contents conflict in docs/conf.py Contents conflict in docs/duplicity.backends.pyrax_identity.hubic.rst Contents conflict in docs/duplicity.backends.pyrax_identity.rst Contents conflict in docs/duplicity.backends.rst Contents conflict in docs/duplicity.backends.ssh_paramiko_backend.rst Contents conflict in docs/duplicity.backends.ssh_pexpect_backend.rst Contents conflict in docs/duplicity.cached_ops.rst Contents conflict in docs/duplicity.dup_temp.rst Contents conflict in docs/duplicity.dup_threading.rst Contents conflict in docs/duplicity.dup_time.rst Contents conflict in docs/duplicity.file_naming.rst Contents conflict in docs/duplicity.rst Contents conflict in docs/index.rst Contents conflict in docs/make.bat Contents conflict in docs/testing.functional.rst Contents conflict in docs/testing.functional.test_badupload.rst Contents conflict in docs/testing.functional.test_cleanup.rst Contents conflict in docs/testing.functional.test_final.rst Contents conflict in docs/testing.functional.test_log.rst Contents conflict in docs/testing.functional.test_rdiffdir.rst Contents conflict in docs/testing.functional.test_restart.rst Contents conflict in docs/testing.functional.test_selection.rst Contents conflict in docs/testing.functional.test_verify.rst Contents conflict in docs/testing.rst Contents conflict in docs/testing.test_code.rst Contents conflict in docs/testing.unit.test_backend.rst Contents conflict in docs/testing.unit.test_backend_instance.rst Contents conflict in docs/testing.unit.test_collections.rst Contents conflict in docs/testing.unit.test_diffdir.rst Contents conflict in docs/testing.unit.test_dup_temp.rst Contents conflict in docs/testing.unit.test_dup_time.rst Contents conflict in docs/testing.unit.test_file_naming.rst Contents conflict in docs/testing.unit.test_globmatch.rst Contents conflict in docs/testing.unit.test_gpg.rst Contents conflict in docs/testing.unit.test_gpginterface.rst Contents conflict in docs/testing.unit.test_lazy.rst Contents conflict in docs/testing.unit.test_manifest.rst Contents conflict in docs/testing.unit.test_patchdir.rst Contents conflict in docs/testing.unit.test_path.rst Contents conflict in docs/testing.unit.test_selection.rst Contents conflict in docs/testing.unit.test_statistics.rst Contents conflict in docs/testing.unit.test_tarfile.rst Contents conflict in docs/testing.unit.test_tempdir.rst Text conflict in duplicity/backend.py Text conflict in duplicity/backends/_cf_pyrax.py Contents conflict in duplicity/backends/acdclibackend.py Contents conflict in duplicity/backends/adbackend.py Text conflict in duplicity/backends/azurebackend.py Text conflict in duplicity/backends/b2backend.py Text conflict in duplicity/backends/dpbxbackend.py Text conflict in duplicity/backends/gdocsbackend.py Text conflict in duplicity/backends/giobackend.py Text conflict in duplicity/backends/hsibackend.py Text conflict in duplicity/backends/hubicbackend.py Contents conflict in duplicity/backends/jottacloudbackend.py Text conflict in duplicity/backends/lftpbackend.py Text conflict in duplicity/backends/localbackend.py Text conflict in duplicity/backends/megabackend.py Text conflict in duplicity/backends/multibackend.py Text conflict in duplicity/backends/ncftpbackend.py Text conflict in duplicity/backends/onedrivebackend.py Text conflict in duplicity/backends/par2backend.py Contents conflict in duplicity/backends/pcabackend.py Text conflict in duplicity/backends/pydrivebackend.py Text conflict in duplicity/backends/rsyncbackend.py Text conflict in duplicity/backends/ssh_paramiko_backend.py Text conflict in duplicity/backends/ssh_pexpect_backend.py Text conflict in duplicity/backends/swiftbackend.py Text conflict in duplicity/backends/sxbackend.py Text conflict in duplicity/backends/tahoebackend.py Text conflict in duplicity/backends/webdavbackend.py Text conflict in duplicity/collections.py Text conflict in duplicity/commandline.py Text conflict in duplicity/compilec.py Text conflict in duplicity/diffdir.py Text conflict in duplicity/dup_threading.py Text conflict in duplicity/globals.py Text conflict in duplicity/globmatch.py Text conflict in duplicity/gpg.py Text conflict in duplicity/lazy.py Text conflict in duplicity/log.py Text conflict in duplicity/manifest.py Text conflict in duplicity/patchdir.py Text conflict in duplicity/progress.py Text conflict in duplicity/selection.py Text conflict in duplicity/statistics.py Text conflict in duplicity/util.py Text conflict in po/bg.po Text conflict in po/bs.po Text conflict in po/ca.po Text conflict in po/ca@valencia.po Text conflict in po/cs.po Text conflict in po/de.po Text conflict in po/duplicity.pot Text conflict in po/el.po Text conflict in po/en_AU.po Text conflict in po/en_GB.po Text conflict in po/eo.po Text conflict in po/es.po Text conflict in po/fi.po Text conflict in po/fr.po Text conflict in po/gl.po Text conflict in po/he.po Text conflict in po/hu.po Text conflict in po/id.po Text conflict in po/io.po Text conflict in po/it.po Text conflict in po/ja.po Text conflict in po/km.po Text conflict in po/ms.po Text conflict in po/nb.po Text conflict in po/nl.po Text conflict in po/oc.po Text conflict in po/pl.po Text conflict in po/pt.po Text conflict in po/pt_BR.po Text conflict in po/ru.po Text conflict in po/sl.po Text conflict in po/sq.po Text conflict in po/sr.po Text conflict in po/sv.po Text conflict in po/tr.po Text conflict in po/ug.po Text conflict in po/uk.po Text conflict in po/zh_CN.po Conflict adding file requirements.txt. Moved existing file to requirements.txt.moved. Text conflict in setup.py Text conflict in testing/__init__.py Contents conflict in testing/functional/test_replicate.py Text conflict in testing/functional/test_selection.py Text conflict in testing/test_code.py Conflict adding file testing/testfiles.tar.gz. Moved existing file to testing/testfiles.tar.gz.moved. Text conflict in testing/unit/test_collections.py Text conflict in testing/unit/test_diffdir.py Text conflict in testing/unit/test_dup_time.py Text conflict in testing/unit/test_globmatch.py Text conflict in testing/unit/test_gpginterface.py Text conflict in testing/unit/test_lazy.py Text conflict in testing/unit/test_manifest.py Text conflict in testing/unit/test_selection.py Text conflict in tox.ini |
| To merge this branch: | bzr merge lp://qastaging/~ed.so/duplicity/remove_copyCom |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Kenneth Loafman | Needs Fixing | ||
|
Review via email:
|
|||
Commit message
remove a small copy.com remainder in man page
To post a comment you must log in.
Revision history for this message
| edso (ed.so) wrote | # |
Revision history for this message
| Kenneth Loafman (kenneth-loafman) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks like you're trying to merge 0.7 into 0.8.
lp:duplicity is 0.8
lp:duplicity/0.7-series is 0.7