diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-10-26 21:18:15 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-10-26 21:18:15 +0000 |
| commit | b0f1fe0181f21145dd7a70ef9fd5814147cb0a6d (patch) | |
| tree | fb424b466a20bf151899cfe0070292c562845dcd /SwordArMor.txt | |
| parent | 2024-10-26T21:00:00Z (diff) | |
| download | repos-b0f1fe0181f21145dd7a70ef9fd5814147cb0a6d.tar.gz repos-b0f1fe0181f21145dd7a70ef9fd5814147cb0a6d.tar.bz2 repos-b0f1fe0181f21145dd7a70ef9fd5814147cb0a6d.zip | |
2024-10-26T21:15:00Z
Diffstat (limited to 'SwordArMor.txt')
| -rw-r--r-- | SwordArMor.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/SwordArMor.txt b/SwordArMor.txt index b3401bfe1e75..a70f0533e614 100644 --- a/SwordArMor.txt +++ b/SwordArMor.txt @@ -14,29 +14,9 @@ pkgcore 0.12.28 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync SwordArMor *** syncing SwordArMor -From https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay - + bec24b4...2fc2e1f 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'... +Already up to date. *** synced SwordArMor - * 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 SwordArMor |