2024-04-21T15:30:00Z

1 files changed, 21 insertions, 7 deletions

diff --git a/bubba.txt b/bubba.txt
index a862ada00b05..21ecbb5e3f7d 100644
--- a/bubba.txt
+++ b/bubba.txt
@@ -15,14 +15,28 @@ pkgcore 0.12.24
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bubba
 *** syncing bubba
 From https://github.com/gordonb3/bubba-overlay
-   af00f23..26fd964  master     -> origin/master
-Updating af00f23..26fd964
-Fast-forward
- app-admin/bubbagen/Manifest               | 2 +-
- app-admin/bubbagen/bubbagen-1.18.0.ebuild | 7 +++++++
- 2 files changed, 8 insertions(+), 1 deletion(-)
+ + 26fd964...651ac8b 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 bubba
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bubba
+*** syncing bubba
+Cloning into '/var/lib/repo-mirror-ci/sync/bubba'...
 *** synced bubba
- * 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 bubba