On Fri, Aug 28, 2015 at 11:05:14AM +0000, Gianfranco Costamagna wrote: > I pushed pristine-tar and upstream branches, for the updated 0.24.0 release, > and > I pushed my debian packaging into master-new.
Was this intended to be merged into master? If so, I did something wrong: [51/546]mh@salida:~/packages/borgbackup$ git clone git://anonscm.debian.org/collab-maint/borgbackup.git Cloning into 'borgbackup'... remote: Counting objects: 207, done. remote: Compressing objects: 100% (178/178), done. remote: Total 207 (delta 67), reused 146 (delta 14) Receiving objects: 100% (207/207), 294.42 KiB | 0 bytes/s, done. Resolving deltas: 100% (67/67), done. Checking connectivity... done. [52/547]mh@salida:~/packages/borgbackup$ ls borgbackup/ [53/548]mh@salida:~/packages/borgbackup$ cd borgbackup/ /home/mh/packages/borgbackup/borgbackup [54/549]mh@salida:~/packages/borgbackup/borgbackup$ ls AUTHORS CHANGES docs/ MANIFEST.in README.rst setup.cfg versioneer.py borg/ debian/ LICENSE PKG-INFO scripts/ setup.py [57/552]mh@salida:~/packages/borgbackup/borgbackup$ git branch -a * master remotes/origin/HEAD -> origin/master remotes/origin/master remotes/origin/master-new remotes/origin/pristine-tar remotes/origin/upstream [60/555]mh@salida:~/packages/borgbackup/borgbackup$ git merge origin/master-new Auto-merging setup.py CONFLICT (add/add): Merge conflict in setup.py Auto-merging setup.cfg CONFLICT (add/add): Merge conflict in setup.cfg Auto-merging docs/usage/serve.rst.inc CONFLICT (add/add): Merge conflict in docs/usage/serve.rst.inc Auto-merging docs/usage/prune.rst.inc CONFLICT (add/add): Merge conflict in docs/usage/prune.rst.inc Auto-merging docs/usage/mount.rst.inc CONFLICT (add/add): Merge conflict in docs/usage/mount.rst.inc Auto-merging docs/usage/list.rst.inc CONFLICT (add/add): Merge conflict in docs/usage/list.rst.inc Auto-merging docs/usage/init.rst.inc CONFLICT (add/add): Merge conflict in docs/usage/init.rst.inc Auto-merging docs/usage/info.rst.inc CONFLICT (add/add): Merge conflict in docs/usage/info.rst.inc Auto-merging docs/usage/extract.rst.inc CONFLICT (add/add): Merge conflict in docs/usage/extract.rst.inc Auto-merging docs/usage/delete.rst.inc CONFLICT (add/add): Merge conflict in docs/usage/delete.rst.inc Auto-merging docs/usage/create.rst.inc CONFLICT (add/add): Merge conflict in docs/usage/create.rst.inc Auto-merging docs/usage/check.rst.inc CONFLICT (add/add): Merge conflict in docs/usage/check.rst.inc Auto-merging docs/usage/change-passphrase.rst.inc CONFLICT (add/add): Merge conflict in docs/usage/change-passphrase.rst.inc Auto-merging docs/usage.rst CONFLICT (add/add): Merge conflict in docs/usage.rst Auto-merging docs/quickstart.rst CONFLICT (add/add): Merge conflict in docs/quickstart.rst Auto-merging docs/internals.rst CONFLICT (add/add): Merge conflict in docs/internals.rst Auto-merging docs/installation.rst CONFLICT (add/add): Merge conflict in docs/installation.rst Auto-merging docs/index.rst CONFLICT (add/add): Merge conflict in docs/index.rst Auto-merging docs/faq.rst CONFLICT (add/add): Merge conflict in docs/faq.rst Auto-merging docs/conf.py CONFLICT (add/add): Merge conflict in docs/conf.py Auto-merging docs/_themes/local/sidebarusefullinks.html CONFLICT (add/add): Merge conflict in docs/_themes/local/sidebarusefullinks.html Auto-merging debian/watch CONFLICT (add/add): Merge conflict in debian/watch Auto-merging debian/patches/rm-github-ribbons.diff CONFLICT (add/add): Merge conflict in debian/patches/rm-github-ribbons.diff Auto-merging debian/control CONFLICT (add/add): Merge conflict in debian/control Auto-merging debian/changelog CONFLICT (add/add): Merge conflict in debian/changelog Auto-merging debian/borg.1 CONFLICT (add/add): Merge conflict in debian/borg.1 Auto-merging borg/xattr.py CONFLICT (add/add): Merge conflict in borg/xattr.py Auto-merging borg/testsuite/repository.py CONFLICT (add/add): Merge conflict in borg/testsuite/repository.py Auto-merging borg/testsuite/platform.py CONFLICT (add/add): Merge conflict in borg/testsuite/platform.py Auto-merging borg/testsuite/helpers.py CONFLICT (add/add): Merge conflict in borg/testsuite/helpers.py Auto-merging borg/testsuite/hashindex.py CONFLICT (add/add): Merge conflict in borg/testsuite/hashindex.py Auto-merging borg/testsuite/chunker.py CONFLICT (add/add): Merge conflict in borg/testsuite/chunker.py Auto-merging borg/testsuite/archiver.py CONFLICT (add/add): Merge conflict in borg/testsuite/archiver.py Auto-merging borg/testsuite/archive.py CONFLICT (add/add): Merge conflict in borg/testsuite/archive.py Auto-merging borg/testsuite/__init__.py CONFLICT (add/add): Merge conflict in borg/testsuite/__init__.py Auto-merging borg/repository.py CONFLICT (add/add): Merge conflict in borg/repository.py Auto-merging borg/remote.py CONFLICT (add/add): Merge conflict in borg/remote.py Auto-merging borg/lrucache.py CONFLICT (add/add): Merge conflict in borg/lrucache.py Auto-merging borg/key.py CONFLICT (add/add): Merge conflict in borg/key.py Auto-merging borg/helpers.py CONFLICT (add/add): Merge conflict in borg/helpers.py Auto-merging borg/hashindex.pyx CONFLICT (add/add): Merge conflict in borg/hashindex.pyx Auto-merging borg/hashindex.c CONFLICT (add/add): Merge conflict in borg/hashindex.c Auto-merging borg/fuse.py CONFLICT (add/add): Merge conflict in borg/fuse.py Auto-merging borg/chunker.pyx CONFLICT (add/add): Merge conflict in borg/chunker.pyx Auto-merging borg/chunker.c CONFLICT (add/add): Merge conflict in borg/chunker.c Auto-merging borg/cache.py CONFLICT (add/add): Merge conflict in borg/cache.py Auto-merging borg/archiver.py CONFLICT (add/add): Merge conflict in borg/archiver.py Auto-merging borg/archive.py CONFLICT (add/add): Merge conflict in borg/archive.py Auto-merging borg/_version.py CONFLICT (add/add): Merge conflict in borg/_version.py Auto-merging borg/_hashindex.c CONFLICT (add/add): Merge conflict in borg/_hashindex.c Auto-merging borg/_chunker.c CONFLICT (add/add): Merge conflict in borg/_chunker.c Auto-merging README.rst CONFLICT (add/add): Merge conflict in README.rst Auto-merging PKG-INFO CONFLICT (add/add): Merge conflict in PKG-INFO Auto-merging MANIFEST.in CONFLICT (add/add): Merge conflict in MANIFEST.in Auto-merging AUTHORS CONFLICT (add/add): Merge conflict in AUTHORS Automatic merge failed; fix conflicts and then commit the result. [61/556]mh@salida:~/packages/borgbackup/borgbackup$ ls AUTHORS CHANGES.rst LICENSE README.rst setup.py borg/ debian/ MANIFEST.in scripts/ versioneer.py CHANGES docs/ PKG-INFO setup.cfg [63/558]mh@salida:~/packages/borgbackup/borgbackup$ git status On branch master Your branch is up-to-date with 'origin/master'. You have unmerged paths. Changes to be committed: new file: CHANGES.rst new file: borg/__main__.py new file: borg/locking.py new file: borg/testsuite/locking.py new file: debian/borgbackup.links new file: docs/changes.rst new file: docs/development.rst new file: docs/intro.rst new file: docs/misc/create_chunker-params.txt new file: docs/misc/create_compression.txt new file: docs/support.rst Unmerged paths: both added: AUTHORS both added: MANIFEST.in both added: PKG-INFO both added: README.rst both added: borg/_chunker.c both added: borg/_hashindex.c both added: borg/_version.py both added: borg/archive.py both added: borg/archiver.py both added: borg/cache.py both added: borg/chunker.c both added: borg/chunker.pyx both added: borg/fuse.py both added: borg/hashindex.c both added: borg/hashindex.pyx both added: borg/helpers.py both added: borg/key.py both added: borg/lrucache.py both added: borg/remote.py both added: borg/repository.py both added: borg/testsuite/__init__.py both added: borg/testsuite/archive.py both added: borg/testsuite/archiver.py both added: borg/testsuite/chunker.py both added: borg/testsuite/hashindex.py both added: borg/testsuite/helpers.py both added: borg/testsuite/platform.py both added: borg/testsuite/repository.py both added: borg/xattr.py both added: debian/borg.1 both added: debian/changelog both added: debian/control both added: debian/patches/rm-github-ribbons.diff both added: debian/watch both added: docs/_themes/local/sidebarusefullinks.html both added: docs/conf.py both added: docs/faq.rst both added: docs/index.rst both added: docs/installation.rst both added: docs/internals.rst both added: docs/quickstart.rst both added: docs/usage.rst both added: docs/usage/change-passphrase.rst.inc both added: docs/usage/check.rst.inc both added: docs/usage/create.rst.inc both added: docs/usage/delete.rst.inc both added: docs/usage/extract.rst.inc both added: docs/usage/info.rst.inc both added: docs/usage/init.rst.inc both added: docs/usage/list.rst.inc both added: docs/usage/mount.rst.inc both added: docs/usage/prune.rst.inc both added: docs/usage/serve.rst.inc both added: setup.cfg both added: setup.py [64/559]mh@salida:~/packages/borgbackup/borgbackup$ How was this intended to be used? Greetings Marc -- ----------------------------------------------------------------------------- Marc Haber | "I don't trust Computers. They | Mailadresse im Header Leimen, Germany | lose things." Winona Ryder | Fon: *49 6224 1600402 Nordisch by Nature | How to make an American Quilt | Fax: *49 6224 1600421