2023-05-14T09:45:01Z

1 files changed, 8 insertions, 21 deletions

diff --git a/cova.txt b/cova.txt
index 19cb75f34dcc..bb4040b209f9 100644
--- a/cova.txt
+++ b/cova.txt
@@ -16,28 +16,15 @@ pkgcore 0.12.20
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync cova
 *** syncing cova
 From https://github.com/cova-fe/cova-overlay
- + 4686c05...1c59ef0 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 cova
- * Sync failed with 1
- * Will try to re-create
-$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync cova
-*** syncing cova
-Cloning into '/var/lib/repo-mirror-ci/sync/cova'...
+   1c59ef0..7907d40  main       -> origin/main
+Updating 1c59ef0..7907d40
+Fast-forward
+ media-fonts/nerd-fonts/Manifest                   |  54 ++++++
+ media-fonts/nerd-fonts/nerd-fonts-3.0.1-r1.ebuild | 195 ++++++++++++++++++++++
+ 2 files changed, 249 insertions(+)
+ create mode 100644 media-fonts/nerd-fonts/nerd-fonts-3.0.1-r1.ebuild
 *** synced cova
- * 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 cova