2021-03-31T13:15:01Z

1 files changed, 14 insertions, 38 deletions

diff --git a/hering-overlay.txt b/hering-overlay.txt
index 8acafc2a92d3..cb09215274ad 100644
--- a/hering-overlay.txt
+++ b/hering-overlay.txt
@@ -9,47 +9,23 @@
  'source': [{'type': 'git',
              'uri': 'https://github.com/internethering/hering-overlay.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync hering-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haarp repo at '/var/lib/repo-mirror-ci/sync/haarp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hamper-overlay repo at '/var/lib/repo-mirror-ci/sync/hamper-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:han repo at '/var/lib/repo-mirror-ci/sync/han', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hangul-typing repo at '/var/lib/repo-mirror-ci/sync/hangul-typing', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haarp repo at '/var/lib/repo-mirror-ci/sync/haarp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hangul-typing repo at '/var/lib/repo-mirror-ci/sync/hangul-typing', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:heindsight repo at '/var/lib/repo-mirror-ci/sync/heindsight', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing hering-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/hering-overlay'...
+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.
 *** synced hering-overlay
  * Sync succeeded
 $ git log --format=%ci -1