diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-02-21 08:03:12 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-02-21 08:03:12 +0000 |
commit | 3cc0f6ce458b28bd40af51dc788b2fd9f4c01d43 (patch) | |
tree | b0924d7698fbe6c308cc091fb3b3d224425a6377 /gig.txt | |
parent | 2024-02-21T07:45:00Z (diff) | |
download | repos-3cc0f6ce458b28bd40af51dc788b2fd9f4c01d43.tar.gz repos-3cc0f6ce458b28bd40af51dc788b2fd9f4c01d43.tar.bz2 repos-3cc0f6ce458b28bd40af51dc788b2fd9f4c01d43.zip |
2024-02-21T08:00:00Z
Diffstat (limited to 'gig.txt')
-rw-r--r-- | gig.txt | 24 |
1 files changed, 2 insertions, 22 deletions
@@ -11,29 +11,9 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gig *** syncing gig -From https://github.com/Gig-OS/gig - + d4831df...77e5a2c 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 gig - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gig -*** syncing gig -Cloning into '/var/lib/repo-mirror-ci/sync/gig'... +Already up to date. *** synced gig - * 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 gig |