From 6a424a72a03b5f9a29e9ba0d9bc4030cc4c0fbf0 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 3 Jul 2022 15:17:10 +0000 Subject: 2022-07-03T15:15:01Z --- booboo.txt | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'booboo.txt') diff --git a/booboo.txt b/booboo.txt index 376c998ef54c..dec1b970cb7c 100644 --- a/booboo.txt +++ b/booboo.txt @@ -14,29 +14,9 @@ pkgcore 0.12.11 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync booboo *** syncing booboo -From https://github.com/l29ah/booboo - + 2efff44...3afd710 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 booboo - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync booboo -*** syncing booboo -Cloning into '/var/lib/repo-mirror-ci/sync/booboo'... +Already up to date. *** synced booboo - * 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 booboo -- cgit v1.2.3-65-gdbad