diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-02-25 14:33:24 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-02-25 14:33:24 +0000 |
| commit | a887c39b879d5e2bb160121bceafbe03ca3e693d (patch) | |
| tree | de650ca858fd8d3cc4ae23b9e0dd0a12c8292edb /amano-kenji.txt | |
| parent | 2024-02-25T14:15:00Z (diff) | |
| download | repos-a887c39b879d5e2bb160121bceafbe03ca3e693d.tar.gz repos-a887c39b879d5e2bb160121bceafbe03ca3e693d.tar.bz2 repos-a887c39b879d5e2bb160121bceafbe03ca3e693d.zip | |
2024-02-25T14:30:00Z
Diffstat (limited to 'amano-kenji.txt')
| -rw-r--r-- | amano-kenji.txt | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/amano-kenji.txt b/amano-kenji.txt index 709c4f4a247e..2d70fa17b8f1 100644 --- a/amano-kenji.txt +++ b/amano-kenji.txt @@ -14,9 +14,29 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync amano-kenji *** syncing amano-kenji -Already up to date. +From https://codeberg.org/amano.kenji/gentoo-overlay + + 47fdab6...1c8d692 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 |