2024-06-13T16:30:00Z

1 files changed, 7 insertions, 21 deletions

diff --git a/9999.txt b/9999.txt
index 2de254317bb6..cfd19265032a 100644
--- a/9999.txt
+++ b/9999.txt
@@ -14,28 +14,14 @@ pkgcore 0.12.24
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync 9999
 *** syncing 9999
 From https://github.com/257/9999
- + 25b417d...501e1fc 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 9999
- * Sync failed with 1
- * Will try to re-create
-$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync 9999
-*** syncing 9999
-Cloning into '/var/lib/repo-mirror-ci/sync/9999'...
+   e3ee279..be4afb6  main       -> origin/main
+Updating e3ee279..be4afb6
+Fast-forward
+ dev-db/pgx/Manifest | 2 ++
+ 1 file changed, 2 insertions(+)
+ create mode 100644 dev-db/pgx/Manifest
 *** synced 9999
- * 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 9999