2023-09-02T03:45:01Z

1 files changed, 3 insertions, 21 deletions

diff --git a/didos.txt b/didos.txt
index d56f77c962f1..5065d610a47b 100644
--- a/didos.txt
+++ b/didos.txt
@@ -15,28 +15,10 @@ pkgcore 0.12.21
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync didos
 *** syncing didos
 From https://github.com/prototype99/didos
- + 162df3d4...e8b96c47 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 didos
- * Sync failed with 1
- * Will try to re-create
-$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync didos
-*** syncing didos
-Cloning into '/var/lib/repo-mirror-ci/sync/didos'...
+ + e8b96c47...740d31b6 master     -> origin/master  (forced update)
+Already up to date.
 *** synced didos
- * 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 didos