diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-07-26 16:04:37 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-07-26 16:04:37 +0000 |
| commit | 8d70171ab313a1e859f6c215ba4bbe7057d6c906 (patch) | |
| tree | 32d9bd2daed351364bf9c41fcbeac1861befcd7e /blackburn29.txt | |
| parent | 2024-07-26T15:45:00Z (diff) | |
| download | repos-8d70171ab313a1e859f6c215ba4bbe7057d6c906.tar.gz repos-8d70171ab313a1e859f6c215ba4bbe7057d6c906.tar.bz2 repos-8d70171ab313a1e859f6c215ba4bbe7057d6c906.zip | |
2024-07-26T16:00:00Z
Diffstat (limited to 'blackburn29.txt')
| -rw-r--r-- | blackburn29.txt | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/blackburn29.txt b/blackburn29.txt index 1e92f8cc0697..49a65bb9cf28 100644 --- a/blackburn29.txt +++ b/blackburn29.txt @@ -16,17 +16,28 @@ 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 - 96c3a38..6a2de5a master -> origin/master -Updating 96c3a38..6a2de5a -Fast-forward - dev-util/rustrover/Manifest | 6 +- - dev-util/rustrover/rustrover-2024.1.4.ebuild | 75 ---------------------- - ...r-2024.1.3.ebuild => rustrover-2024.1.6.ebuild} | 27 +++++++- - 3 files changed, 26 insertions(+), 82 deletions(-) - delete mode 100644 dev-util/rustrover/rustrover-2024.1.4.ebuild - rename dev-util/rustrover/{rustrover-2024.1.3.ebuild => rustrover-2024.1.6.ebuild} (73%) + + 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'... *** synced blackburn29 - * Sync succeeded + * Sync succeeded after re-adding $ 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 |