diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-09-17 16:16:23 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-09-17 16:16:23 +0000 |
| commit | 51d5d51acd9c53421a45493355a6ca4f5d493317 (patch) | |
| tree | 59169c8b6f06cd2d75760a85ef39381457e2b816 /bitcoin.txt | |
| parent | 2023-09-17T16:00:01Z (diff) | |
| download | repos-51d5d51acd9c53421a45493355a6ca4f5d493317.tar.gz repos-51d5d51acd9c53421a45493355a6ca4f5d493317.tar.bz2 repos-51d5d51acd9c53421a45493355a6ca4f5d493317.zip | |
2023-09-17T16:15:01Z
Diffstat (limited to 'bitcoin.txt')
| -rw-r--r-- | bitcoin.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/bitcoin.txt b/bitcoin.txt index 3e9da1380947..b843f11695c1 100644 --- a/bitcoin.txt +++ b/bitcoin.txt @@ -11,29 +11,9 @@ pkgcore 0.12.21 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bitcoin *** syncing bitcoin -From https://gitlab.com/bitcoin/gentoo - + 3778a84...f230573 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'... +Already up to date. *** synced bitcoin - * 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 bitcoin |