diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-06-11 08:50:52 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-06-11 08:50:52 +0000 |
| commit | f2a639cdcd7cb7fa963a6737a46ca71665301ce0 (patch) | |
| tree | d7b5c1c05f8d9079be824829f322cbe104673b04 /hering-overlay.txt | |
| parent | 2024-06-11T08:30:00Z (diff) | |
| download | repos-f2a639cdcd7cb7fa963a6737a46ca71665301ce0.tar.gz repos-f2a639cdcd7cb7fa963a6737a46ca71665301ce0.tar.bz2 repos-f2a639cdcd7cb7fa963a6737a46ca71665301ce0.zip | |
2024-06-11T08:45:00Z
Diffstat (limited to 'hering-overlay.txt')
| -rw-r--r-- | hering-overlay.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/hering-overlay.txt b/hering-overlay.txt index 0dcec81b0840..a618b864bc28 100644 --- a/hering-overlay.txt +++ b/hering-overlay.txt @@ -15,29 +15,9 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync hering-overlay *** syncing hering-overlay -From https://github.com/internethering/hering-overlay - + 25c58af...b68df7e 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 hering-overlay - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync hering-overlay -*** syncing hering-overlay -Cloning into '/var/lib/repo-mirror-ci/sync/hering-overlay'... +Already up to date. *** synced hering-overlay - * 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 hering-overlay |