diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-08-18 23:01:36 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-08-18 23:01:36 +0000 |
| commit | 570e7e450ffedeea95ee7b0f3cff3157533da744 (patch) | |
| tree | d565cf6e5cda071ee216dd3e21a1b1799536c2db /tatsh-overlay.txt | |
| parent | 2023-08-18T22:45:01Z (diff) | |
| download | repos-570e7e450ffedeea95ee7b0f3cff3157533da744.tar.gz repos-570e7e450ffedeea95ee7b0f3cff3157533da744.tar.bz2 repos-570e7e450ffedeea95ee7b0f3cff3157533da744.zip | |
2023-08-18T23:00:01Z
Diffstat (limited to 'tatsh-overlay.txt')
| -rw-r--r-- | tatsh-overlay.txt | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/tatsh-overlay.txt b/tatsh-overlay.txt index d6c99d3da8aa..54dcb4b7a77e 100644 --- a/tatsh-overlay.txt +++ b/tatsh-overlay.txt @@ -15,9 +15,29 @@ pkgcore 0.12.21 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tatsh-overlay *** syncing tatsh-overlay -Already up to date. +From https://github.com/Tatsh/tatsh-overlay + + 6eab1fcf...6f909844 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 tatsh-overlay + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tatsh-overlay +*** syncing tatsh-overlay +Cloning into '/var/lib/repo-mirror-ci/sync/tatsh-overlay'... *** synced tatsh-overlay - * 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 tatsh-overlay |