From 2b953d48299b9c93459c10cffba8f71fd73ea25e Mon Sep 17 00:00:00 2001
From: Repository mirror & CI <repomirrorci@gentoo.org>
Date: Thu, 21 Nov 2024 21:03:14 +0000
Subject: 2024-11-21T21:00:00Z

---
 tex-overlay.txt | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

(limited to 'tex-overlay.txt')

diff --git a/tex-overlay.txt b/tex-overlay.txt
index 83765eb61689..1d0c29c4e0ad 100644
--- a/tex-overlay.txt
+++ b/tex-overlay.txt
@@ -10,22 +10,11 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tex-overlay
+WARNING:pkgcore:tex-overlay repo at '/var/lib/repo-mirror-ci/sync/tex-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:tex-overlay repo at '/var/lib/repo-mirror-ci/sync/tex-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing tex-overlay
-From https://anongit.gentoo.org/git/proj/tex-overlay
- + 7b0d2b5...a136201 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.
+Your configuration specifies to merge with the ref 'refs/heads/master'
+from the remote, but no such ref was fetched.
 !!! failed syncing tex-overlay
  * Sync failed with 1
  * Will try to re-create
-- 
cgit v1.2.3-65-gdbad