summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2022-07-02 07:01:13 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2022-07-02 07:01:13 +0000
commitf6944b3d29c6a14e32e8db6c5e88015449c3f037 (patch)
tree52307a5a08eb973d29603342730cff4880025917 /sinustrom.txt
parent2022-07-02T06:45:01Z (diff)
downloadrepos-f6944b3d29c6a14e32e8db6c5e88015449c3f037.tar.gz
repos-f6944b3d29c6a14e32e8db6c5e88015449c3f037.tar.bz2
repos-f6944b3d29c6a14e32e8db6c5e88015449c3f037.zip
2022-07-02T07:00:01Z
Diffstat (limited to 'sinustrom.txt')
-rw-r--r--sinustrom.txt26
1 files changed, 4 insertions, 22 deletions
diff --git a/sinustrom.txt b/sinustrom.txt
index 12890dbb56c2..afff9e306fc9 100644
--- a/sinustrom.txt
+++ b/sinustrom.txt
@@ -14,30 +14,12 @@
pkgcore 0.12.11
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sinustrom
+WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:sevz repo at '/var/lib/repo-mirror-ci/sync/sevz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing sinustrom
-From https://github.com/zpuskas/sinustrom-gentoo-overlay
- + a9d8113...58c5da0 master -> origin/master (forced update)
-hint: You have divergent branches and need to specify how to reconcile them.
-hint: You can do so by running one of the following commands sometime before
-hint: your next pull:
-hint:
-hint: git config pull.rebase false # merge
-hint: git config pull.rebase true # rebase
-hint: git config pull.ff only # fast-forward only
-hint:
-hint: You can replace "git config" with "git config --global" to set a default
-hint: preference for all repositories. You can also pass --rebase, --no-rebase,
-hint: or --ff-only on the command line to override the configured default per
-hint: invocation.
-fatal: Need to specify how to reconcile divergent branches.
-!!! failed syncing sinustrom
- * Sync failed with 1
- * Will try to re-create
-$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sinustrom
-*** syncing sinustrom
-Cloning into '/var/lib/repo-mirror-ci/sync/sinustrom'...
+Already up to date.
*** synced sinustrom
- * Sync succeeded after re-adding
+ * Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 sinustrom