diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-12-13 06:03:39 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-12-13 06:03:39 +0000 |
| commit | aa68022e79e3ae040459e951518efb746bb59ca7 (patch) | |
| tree | ab7eada7b65f2ea7c90fac3261a7dc2e97e59ac5 /mrtnvgr.txt | |
| parent | 2023-12-13T05:45:01Z (diff) | |
| download | repos-aa68022e79e3ae040459e951518efb746bb59ca7.tar.gz repos-aa68022e79e3ae040459e951518efb746bb59ca7.tar.bz2 repos-aa68022e79e3ae040459e951518efb746bb59ca7.zip | |
2023-12-13T06:00:01Z
Diffstat (limited to 'mrtnvgr.txt')
| -rw-r--r-- | mrtnvgr.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/mrtnvgr.txt b/mrtnvgr.txt index 0c6c6fc16d59..d34445598a00 100644 --- a/mrtnvgr.txt +++ b/mrtnvgr.txt @@ -16,29 +16,9 @@ pkgcore 0.12.23 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync mrtnvgr WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing mrtnvgr -From https://github.com/mrtnvgr/gentoo-overlay - + e2f1ac4...ee7d5c7 main -> origin/main (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 mrtnvgr - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync mrtnvgr -*** syncing mrtnvgr -Cloning into '/var/lib/repo-mirror-ci/sync/mrtnvgr'... +Already up to date. *** synced mrtnvgr - * 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 mrtnvgr |