2025-01-29T19:15:00Z

1 files changed, 21 insertions, 20 deletions

diff --git a/9999.txt b/9999.txt
index 533108226d03..4f8d6e5ca474 100644
--- a/9999.txt
+++ b/9999.txt
@@ -14,27 +14,28 @@ pkgcore 0.12.28
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync 9999
 *** syncing 9999
 From https://github.com/257/9999
-   fc12ed7..48d29ce  main       -> origin/main
-Updating fc12ed7..48d29ce
-Fast-forward
- dev-python/isd/Manifest                            |  1 +
- dev-python/isd/isd-9999.ebuild                     | 38 ++++++++++++++++++++++
- dev-python/pfzy/Manifest                           |  1 +
- dev-python/pfzy/pfzy-9999.ebuild                   | 35 ++++++++++++++++++++
- dev-python/xdg-base-dirs/Manifest                  |  1 +
- dev-python/xdg-base-dirs/xdg-base-dirs-9999.ebuild | 31 ++++++++++++++++++
- dev-util/android-studio/Manifest                   |  4 +--
- ... => android-studio-2024.3.2.3_p20250129.ebuild} |  0
- 8 files changed, 109 insertions(+), 2 deletions(-)
- create mode 100644 dev-python/isd/Manifest
- create mode 100644 dev-python/isd/isd-9999.ebuild
- create mode 100644 dev-python/pfzy/Manifest
- create mode 100644 dev-python/pfzy/pfzy-9999.ebuild
- create mode 100644 dev-python/xdg-base-dirs/Manifest
- create mode 100644 dev-python/xdg-base-dirs/xdg-base-dirs-9999.ebuild
- rename dev-util/android-studio/{android-studio-2024.3.2.3_p20250128.ebuild => android-studio-2024.3.2.3_p20250129.ebuild} (100%)
+ + 48d29ce...9b7611f 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'...
 *** synced 9999
- * 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 9999