diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-01-06 21:31:58 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-01-06 21:31:58 +0000 |
| commit | a700b1420099bdf8dc9f04d30e2b3e3a2d0a9bb3 (patch) | |
| tree | b454d024d93953751ed3f2e232c0058934ce437c /bitcoin.txt | |
| parent | 2023-01-06T21:15:01Z (diff) | |
| download | repos-a700b1420099bdf8dc9f04d30e2b3e3a2d0a9bb3.tar.gz repos-a700b1420099bdf8dc9f04d30e2b3e3a2d0a9bb3.tar.bz2 repos-a700b1420099bdf8dc9f04d30e2b3e3a2d0a9bb3.zip | |
2023-01-06T21:30:01Z
Diffstat (limited to 'bitcoin.txt')
| -rw-r--r-- | bitcoin.txt | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/bitcoin.txt b/bitcoin.txt index 152aa8afcad6..72ce32579a63 100644 --- a/bitcoin.txt +++ b/bitcoin.txt @@ -12,17 +12,28 @@ pkgcore 0.12.17 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bitcoin *** syncing bitcoin From https://gitlab.com/bitcoin/gentoo - 2d35204..abb6f80 master -> origin/master -Updating 2d35204..abb6f80 -Fast-forward - dev-libs/libsecp256k1-zkp/Manifest | 4 ++-- - .../libsecp256k1-zkp/libsecp256k1-zkp-0.1.0_pre20220401.ebuild | 9 ++++++--- - .../libsecp256k1-zkp/libsecp256k1-zkp-0.1.0_pre20220903.ebuild | 10 ++++++---- - dev-libs/libsecp256k1/Manifest | 2 -- - dev-libs/libsecp256k1/libsecp256k1-0.1.0_pre20220803.ebuild | 10 ++++++---- - 5 files changed, 20 insertions(+), 15 deletions(-) + + abb6f80...68c5f54 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 bitcoin + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bitcoin +*** syncing bitcoin +Cloning into '/var/lib/repo-mirror-ci/sync/bitcoin'... *** synced bitcoin - * 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 bitcoin |