2024-01-24T02:30:01Z

1 files changed, 21 insertions, 3 deletions

diff --git a/nymphos.txt b/nymphos.txt
index c21abff6d01f..ea9703da3341 100644
--- a/nymphos.txt
+++ b/nymphos.txt
@@ -13,10 +13,28 @@ pkgcore 0.12.24
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync nymphos
 *** syncing nymphos
 From https://github.com/neeshy/nymphos
- + bfbf0d9...d575733 master     -> origin/master  (forced update)
-Already up to date.
+   d575733..1db237a  master     -> origin/master
+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 nymphos
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync nymphos
+*** syncing nymphos
+Cloning into '/var/lib/repo-mirror-ci/sync/nymphos'...
 *** synced nymphos
- * 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 nymphos