2021-03-31T13:15:01Z

1 files changed, 14 insertions, 37 deletions

diff --git a/flammie.txt b/flammie.txt
index a955d8246bcf..a01410a16658 100644
--- a/flammie.txt
+++ b/flammie.txt
@@ -13,46 +13,23 @@
             {'type': 'git',
              'uri': 'git://github.com/flammie/flammie-overlay.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync flammie
-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:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', 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:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', 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:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', 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:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:enlightenment-live repo at '/var/lib/repo-mirror-ci/sync/enlightenment-live', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:equaeghe repo at '/var/lib/repo-mirror-ci/sync/equaeghe', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:erayd repo at '/var/lib/repo-mirror-ci/sync/erayd', 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:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', 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:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', 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:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', 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:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:escpr2 repo at '/var/lib/repo-mirror-ci/sync/escpr2', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ethereum repo at '/var/lib/repo-mirror-ci/sync/ethereum', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eugene-bright repo at '/var/lib/repo-mirror-ci/sync/eugene-bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:farmboy0 repo at '/var/lib/repo-mirror-ci/sync/farmboy0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ferki repo at '/var/lib/repo-mirror-ci/sync/ferki', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing flammie
-Cloning into '/var/lib/repo-mirror-ci/sync/flammie'...
+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 flammie
  * Sync succeeded
 $ git log --format=%ci -1