diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-07-05 06:16:24 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-07-05 06:16:24 +0000 |
commit | a559c994c041c4097e23169b99ff63798784001e (patch) | |
tree | a73650d221a3961ecb4f92723efeec1667cbc20e /phoenix591.txt | |
parent | 2022-07-05T06:00:01Z (diff) | |
download | repos-a559c994c041c4097e23169b99ff63798784001e.tar.gz repos-a559c994c041c4097e23169b99ff63798784001e.tar.bz2 repos-a559c994c041c4097e23169b99ff63798784001e.zip |
2022-07-05T06:15:01Z
Diffstat (limited to 'phoenix591.txt')
-rw-r--r-- | phoenix591.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/phoenix591.txt b/phoenix591.txt index d1dc5113204f..cc3bee57a5b9 100644 --- a/phoenix591.txt +++ b/phoenix591.txt @@ -15,29 +15,9 @@ pkgcore 0.12.11 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync phoenix591 *** syncing phoenix591 -From https://github.com/Phoenix591/gentoo-overlay - + 5ec02d8...7129652 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 phoenix591 - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync phoenix591 -*** syncing phoenix591 -Cloning into '/var/lib/repo-mirror-ci/sync/phoenix591'... +Already up to date. *** synced phoenix591 - * 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 phoenix591 |