diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-05-19 16:18:43 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-05-19 16:18:43 +0000 |
| commit | 30c20801a4c68b1da5353d5686eb978defa5b8a2 (patch) | |
| tree | d9673582e5a49b868ad788dd8ab87b178b5c127d /SarahMiaOverlay.txt | |
| parent | 2023-05-19T16:00:01Z (diff) | |
| download | repos-30c20801a4c68b1da5353d5686eb978defa5b8a2.tar.gz repos-30c20801a4c68b1da5353d5686eb978defa5b8a2.tar.bz2 repos-30c20801a4c68b1da5353d5686eb978defa5b8a2.zip | |
2023-05-19T16:15:01Z
Diffstat (limited to 'SarahMiaOverlay.txt')
| -rw-r--r-- | SarahMiaOverlay.txt | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/SarahMiaOverlay.txt b/SarahMiaOverlay.txt index 72fa67d7c342..f87db7a713b6 100644 --- a/SarahMiaOverlay.txt +++ b/SarahMiaOverlay.txt @@ -17,30 +17,9 @@ pkgcore 0.12.20 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync SarahMiaOverlay WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing SarahMiaOverlay -From https://gitlab.com/SarahMia/sarahmiaoverlay - + 1a8009f...20ee3ec 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 SarahMiaOverlay - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync SarahMiaOverlay -WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -*** syncing SarahMiaOverlay -Cloning into '/var/lib/repo-mirror-ci/sync/SarahMiaOverlay'... +Already up to date. *** synced SarahMiaOverlay - * 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 SarahMiaOverlay |