diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-10-18 21:03:16 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-10-18 21:03:16 +0000 |
| commit | bae073bd1973a55d08dc9b3a1d531b3e3e32a466 (patch) | |
| tree | e73daba538e226783f5e6e0f6a70ba2756dba2b1 /bitcoin.txt | |
| parent | 2024-10-18T20:45:00Z (diff) | |
| download | repos-bae073bd1973a55d08dc9b3a1d531b3e3e32a466.tar.gz repos-bae073bd1973a55d08dc9b3a1d531b3e3e32a466.tar.bz2 repos-bae073bd1973a55d08dc9b3a1d531b3e3e32a466.zip | |
2024-10-18T21:00:00Z
Diffstat (limited to 'bitcoin.txt')
| -rw-r--r-- | bitcoin.txt | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/bitcoin.txt b/bitcoin.txt index dbec06605b5f..f9348551cadc 100644 --- a/bitcoin.txt +++ b/bitcoin.txt @@ -11,9 +11,29 @@ pkgcore 0.12.28 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bitcoin *** syncing bitcoin -Already up to date. +From https://gitlab.com/bitcoin/gentoo + 6d6ffdf..79023b1 master -> origin/master +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 |