summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'khoverlay.txt')
-rw-r--r--khoverlay.txt49
1 files changed, 14 insertions, 35 deletions
diff --git a/khoverlay.txt b/khoverlay.txt
index e8680009cd48..54fec192de90 100644
--- a/khoverlay.txt
+++ b/khoverlay.txt
@@ -10,43 +10,22 @@
{'type': 'git',
'uri': 'git+ssh://git@gitlab.com/khumba/khoverlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync khoverlay
-WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ag-ops repo at '/var/lib/repo-mirror-ci/sync/ag-ops', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:concaveoverlay repo at '/var/lib/repo-mirror-ci/sync/concaveoverlay', 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).
-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: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: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:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', 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:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ag-ops repo at '/var/lib/repo-mirror-ci/sync/ag-ops', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:concaveoverlay repo at '/var/lib/repo-mirror-ci/sync/concaveoverlay', 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).
-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: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: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:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', 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:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', 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/khoverlay'...
+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 khoverlay
*** synced khoverlay
* Sync succeeded