diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-06-30 13:33:50 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-06-30 13:33:50 +0000 |
| commit | 793fec3a137894f01216b5fe1227fa39aa207f46 (patch) | |
| tree | cb0634ad720c173bffadb337a95e8ca9c027436e /arrans-overlay.txt | |
| parent | 2024-06-30T13:15:00Z (diff) | |
| download | repos-793fec3a137894f01216b5fe1227fa39aa207f46.tar.gz repos-793fec3a137894f01216b5fe1227fa39aa207f46.tar.bz2 repos-793fec3a137894f01216b5fe1227fa39aa207f46.zip | |
2024-06-30T13:30:00Z
Diffstat (limited to 'arrans-overlay.txt')
| -rw-r--r-- | arrans-overlay.txt | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/arrans-overlay.txt b/arrans-overlay.txt index 841ee11977ea..a68c69368159 100644 --- a/arrans-overlay.txt +++ b/arrans-overlay.txt @@ -16,28 +16,18 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync arrans-overlay *** syncing arrans-overlay From https://github.com/arran4/arrans_overlay - + 5b4c51c...6dc2080 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 arrans-overlay - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync arrans-overlay -*** syncing arrans-overlay -Cloning into '/var/lib/repo-mirror-ci/sync/arrans-overlay'... + f9b54e6..837f248 main -> origin/main +Updating f9b54e6..837f248 +Fast-forward + .../app-misc-lemmy-notify-appimage-update.yaml | 24 +++++++----- + .../app-misc-stability-matrix-appimage-update.yaml | 23 ++++++++---- + .github/workflows/dev-ml-ollama-bin-update.yaml | 22 +++++++---- + app-misc/jan-appimage/Manifest | 1 + + app-misc/jan-appimage/jan-appimage-0.4.12.ebuild | 43 ++++++++++++++++++++++ + 5 files changed, 88 insertions(+), 25 deletions(-) + create mode 100644 app-misc/jan-appimage/jan-appimage-0.4.12.ebuild *** synced arrans-overlay - * 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 arrans-overlay |