diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-09-18 18:03:52 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-09-18 18:03:52 +0000 |
| commit | 69fe06df3def5e1948d201bc189d6d0f91746451 (patch) | |
| tree | 290517adfd0ce848e46fb36c7c7ed971b5d63293 /SwordArMor.txt | |
| parent | 2024-09-18T17:45:00Z (diff) | |
| download | repos-69fe06df3def5e1948d201bc189d6d0f91746451.tar.gz repos-69fe06df3def5e1948d201bc189d6d0f91746451.tar.bz2 repos-69fe06df3def5e1948d201bc189d6d0f91746451.zip | |
2024-09-18T18:00:00Z
Diffstat (limited to 'SwordArMor.txt')
| -rw-r--r-- | SwordArMor.txt | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/SwordArMor.txt b/SwordArMor.txt index 5d26a41146df..5790ae97d33a 100644 --- a/SwordArMor.txt +++ b/SwordArMor.txt @@ -14,9 +14,29 @@ pkgcore 0.12.27 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync SwordArMor *** syncing SwordArMor -Already up to date. +From https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay + + 8e7694a...553a1bf 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 SwordArMor + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync SwordArMor +*** syncing SwordArMor +Cloning into '/var/lib/repo-mirror-ci/sync/SwordArMor'... *** synced SwordArMor - * 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 SwordArMor |