diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-02-25 23:03:22 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-02-25 23:03:22 +0000 |
| commit | 3760a4acce86bd4a453c1bdd1c554868d6d08f95 (patch) | |
| tree | d2728dbcf540039c7962e2ecacc12e75044eaad0 /amano-kenji.txt | |
| parent | 2024-02-25T22:45:00Z (diff) | |
| download | repos-3760a4acce86bd4a453c1bdd1c554868d6d08f95.tar.gz repos-3760a4acce86bd4a453c1bdd1c554868d6d08f95.tar.bz2 repos-3760a4acce86bd4a453c1bdd1c554868d6d08f95.zip | |
2024-02-25T23:00:00Z
Diffstat (limited to 'amano-kenji.txt')
| -rw-r--r-- | amano-kenji.txt | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/amano-kenji.txt b/amano-kenji.txt index 0129543756fd..e5a4f7a07b24 100644 --- a/amano-kenji.txt +++ b/amano-kenji.txt @@ -15,18 +15,28 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync amano-kenji *** syncing amano-kenji From https://codeberg.org/amano.kenji/gentoo-overlay - 1c8d692..4130142 master -> origin/master -Updating 1c8d692..4130142 -Fast-forward - dev-janet/j3blocks-extra/Manifest | 2 +- - ...locks-extra-0_p20240225.ebuild => j3blocks-extra-0_p20240226.ebuild} | 2 +- - dev-janet/j3blocks/Manifest | 2 +- - .../{j3blocks-0_p20240225_p3.ebuild => j3blocks-0_p20240226.ebuild} | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - rename dev-janet/j3blocks-extra/{j3blocks-extra-0_p20240225.ebuild => j3blocks-extra-0_p20240226.ebuild} (88%) - rename dev-janet/j3blocks/{j3blocks-0_p20240225_p3.ebuild => j3blocks-0_p20240226.ebuild} (88%) + + 4130142...765bcce 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 amano-kenji + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync amano-kenji +*** syncing amano-kenji +Cloning into '/var/lib/repo-mirror-ci/sync/amano-kenji'... *** synced amano-kenji - * 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 amano-kenji |