diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-02-09 16:01:45 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-02-09 16:01:45 +0000 |
| commit | f087b72563984da1c6344923f53e5f9c78a1047b (patch) | |
| tree | 9f5a40af28030af7dc951c36c45dc3a71a61aa6c /Systole.txt | |
| parent | 2023-02-09T15:45:01Z (diff) | |
| download | repos-f087b72563984da1c6344923f53e5f9c78a1047b.tar.gz repos-f087b72563984da1c6344923f53e5f9c78a1047b.tar.bz2 repos-f087b72563984da1c6344923f53e5f9c78a1047b.zip | |
2023-02-09T16:00:01Z
Diffstat (limited to 'Systole.txt')
| -rw-r--r-- | Systole.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/Systole.txt b/Systole.txt index 0c7013a7f4c1..c3e55b9be458 100644 --- a/Systole.txt +++ b/Systole.txt @@ -14,29 +14,9 @@ pkgcore 0.12.17 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync Systole *** syncing Systole -From https://github.com/SystoleOS/gentoo-overlay - + 72ac1f8...e9cdb7f 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 Systole - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync Systole -*** syncing Systole -Cloning into '/var/lib/repo-mirror-ci/sync/Systole'... +Already up to date. *** synced Systole - * 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 Systole |