diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-06-13 16:20:42 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-06-13 16:20:42 +0000 |
commit | 02334614db57f7358473e8989117fcbe2f01618b (patch) | |
tree | e4a547af1ce006e207cb03df980ac344bb9f9d42 /9999.txt | |
parent | 2024-06-13T16:00:00Z (diff) | |
download | repos-02334614db57f7358473e8989117fcbe2f01618b.tar.gz repos-02334614db57f7358473e8989117fcbe2f01618b.tar.bz2 repos-02334614db57f7358473e8989117fcbe2f01618b.zip |
2024-06-13T16:15:00Z
Diffstat (limited to '9999.txt')
-rw-r--r-- | 9999.txt | 24 |
1 files changed, 22 insertions, 2 deletions
@@ -13,9 +13,29 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync 9999 *** syncing 9999 -Already up to date. +From https://github.com/257/9999 + + 25b417d...501e1fc 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 9999 + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync 9999 +*** syncing 9999 +Cloning into '/var/lib/repo-mirror-ci/sync/9999'... *** synced 9999 - * 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 9999 |