2020-10-23T17:30:01Z

1 files changed, 14 insertions, 26 deletions

diff --git a/dMaggot.txt b/dMaggot.txt
index 89a809c7f2e..0222d1e01b8 100644
--- a/dMaggot.txt
+++ b/dMaggot.txt
@@ -12,35 +12,23 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/user/dMaggot.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync dMaggot
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/dMaggot'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+  git config pull.rebase false  # merge (the default strategy)
+  git config pull.rebase true   # rebase
+  git config pull.ff only       # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
 *** syncing dMaggot
 *** synced dMaggot
  * Sync succeeded