2020-10-23T13:30:01Z

1 files changed, 14 insertions, 16 deletions

diff --git a/qt.txt b/qt.txt
index 8bbfc561ab89..b488f39f385a 100644
--- a/qt.txt
+++ b/qt.txt
@@ -14,24 +14,22 @@
             {'type': 'git', 'uri': 'git://anongit.gentoo.org/proj/qt.git'},
             {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/proj/qt.git'}],
  'status': 'official'}
- * Adding new repository
 $ pmaint sync qt
-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:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', 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:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mozilla repo at '/var/lib/repo-mirror-ci/sync/mozilla', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', 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:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', 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:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mozilla repo at '/var/lib/repo-mirror-ci/sync/mozilla', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', 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/qt'...
+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 qt
 *** synced qt
  * Sync succeeded