summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde.txt')
-rw-r--r--kde.txt29
1 files changed, 14 insertions, 15 deletions
diff --git a/kde.txt b/kde.txt
index 71e788c292d0..453a0726baf7 100644
--- a/kde.txt
+++ b/kde.txt
@@ -11,22 +11,21 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/proj/kde.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync kde
-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: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:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', 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: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:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', 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/kde'...
+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 kde
*** synced kde
* Sync succeeded