2021-03-31T13:15:01Z

1 files changed, 14 insertions, 33 deletions

diff --git a/elementary.txt b/elementary.txt
index 61960e083cc2..b727b6ca2a57 100644
--- a/elementary.txt
+++ b/elementary.txt
@@ -11,42 +11,23 @@
             {'type': 'git',
              'uri': 'git://github.com/pimvullers/elementary.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync elementary
-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:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', 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:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', 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:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', 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:dlang repo at '/var/lib/repo-mirror-ci/sync/dlang', 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:dotnet repo at '/var/lib/repo-mirror-ci/sync/dotnet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:drdim repo at '/var/lib/repo-mirror-ci/sync/drdim', 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:dwosky repo at '/var/lib/repo-mirror-ci/sync/dwosky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:earshark repo at '/var/lib/repo-mirror-ci/sync/earshark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', 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:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', 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:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:edgets repo at '/var/lib/repo-mirror-ci/sync/edgets', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eigenlay repo at '/var/lib/repo-mirror-ci/sync/eigenlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing elementary
-Cloning into '/var/lib/repo-mirror-ci/sync/elementary'...
+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 elementary
  * Sync succeeded
 $ git log --format=%ci -1