summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2022-05-21 19:17:48 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2022-05-21 19:17:48 +0000
commitc98b88a901a68fa4785e77a39ab2e8b8de5d0598 (patch)
treea331b31bdbd3f5ce5ffe3352a00dcfebe5b40862 /flussence.txt
parent2022-05-21T19:00:01Z (diff)
downloadrepos-c98b88a901a68fa4785e77a39ab2e8b8de5d0598.tar.gz
repos-c98b88a901a68fa4785e77a39ab2e8b8de5d0598.tar.bz2
repos-c98b88a901a68fa4785e77a39ab2e8b8de5d0598.zip
2022-05-21T19:15:01Z
Diffstat (limited to 'flussence.txt')
-rw-r--r--flussence.txt24
1 files changed, 22 insertions, 2 deletions
diff --git a/flussence.txt b/flussence.txt
index 0ec81ddbbe1b..93e5182cca08 100644
--- a/flussence.txt
+++ b/flussence.txt
@@ -15,9 +15,29 @@ pkgcore 0.12.10
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync flussence
*** syncing flussence
-Already up to date.
+From https://repo.or.cz/flussence-overlay
+ + 0cc975b...2afab1f 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 flussence
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync flussence
+*** syncing flussence
+Cloning into '/var/lib/repo-mirror-ci/sync/flussence'...
*** synced flussence
- * 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 flussence