2024-11-19T21:30:00Z

1 files changed, 21 insertions, 8 deletions

diff --git a/Case_Of.txt b/Case_Of.txt
index 06b117aa29ea..115da8d9f79d 100644
--- a/Case_Of.txt
+++ b/Case_Of.txt
@@ -15,15 +15,28 @@ pkgcore 0.12.28
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync Case_Of
 *** syncing Case_Of
 From https://codeberg.org/Case_Of/gentoo-overlay
-   7ee9dbc..196a594  master     -> origin/master
-Updating 7ee9dbc..196a594
-Fast-forward
- x11-misc/albert/Manifest                                       | 6 +++---
- x11-misc/albert/{albert-0.26.7.ebuild => albert-0.26.8.ebuild} | 0
- 2 files changed, 3 insertions(+), 3 deletions(-)
- rename x11-misc/albert/{albert-0.26.7.ebuild => albert-0.26.8.ebuild} (100%)
+ + 196a594...c332535 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 Case_Of
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync Case_Of
+*** syncing Case_Of
+Cloning into '/var/lib/repo-mirror-ci/sync/Case_Of'...
 *** synced Case_Of
- * 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 Case_Of