diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-07-26 16:18:55 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-07-26 16:18:55 +0000 |
commit | 2f4d382af28bb9a42e0203cc2dcfd02491f3a61f (patch) | |
tree | dd3a8726a328f6c40bfab5725291235e770fcbb8 /blackburn29.txt | |
parent | 2024-07-26T16:00:00Z (diff) | |
download | repos-2f4d382af28bb9a42e0203cc2dcfd02491f3a61f.tar.gz repos-2f4d382af28bb9a42e0203cc2dcfd02491f3a61f.tar.bz2 repos-2f4d382af28bb9a42e0203cc2dcfd02491f3a61f.zip |
2024-07-26T16:15:00Z
Diffstat (limited to 'blackburn29.txt')
-rw-r--r-- | blackburn29.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/blackburn29.txt b/blackburn29.txt index 49a65bb9cf28..5c341a36480b 100644 --- a/blackburn29.txt +++ b/blackburn29.txt @@ -15,29 +15,9 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync blackburn29 *** syncing blackburn29 -From https://github.com/blackburn29/blackburn29-overlay - + 6a2de5a...708041b 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 blackburn29 - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync blackburn29 -*** syncing blackburn29 -Cloning into '/var/lib/repo-mirror-ci/sync/blackburn29'... +Already up to date. *** synced blackburn29 - * 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 blackburn29 |