From 2be2fe10ddbc9fcc878218780b218e63bf82202a Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sat, 1 Apr 2023 23:16:46 +0000 Subject: 2023-04-01T23:15:01Z --- lilium.txt | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'lilium.txt') diff --git a/lilium.txt b/lilium.txt index 927e3962b62f..c050c14f561a 100644 --- a/lilium.txt +++ b/lilium.txt @@ -15,9 +15,29 @@ pkgcore 0.12.20 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync lilium *** syncing lilium -Already up to date. +From https://github.com/owl4ce/lilium + + 06f28a0...da23d8f main -> origin/main (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 lilium + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync lilium +*** syncing lilium +Cloning into '/var/lib/repo-mirror-ci/sync/lilium'... *** synced lilium - * Sync succeeded + * Sync succeeded after re-adding $ 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 lilium -- cgit v1.2.3-65-gdbad