diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-11-06 07:06:39 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-11-06 07:06:39 +0000 |
| commit | ab20a26a99dce53db252f615bd40b8ae563f6431 (patch) | |
| tree | 7a268adc8d32315f8b9baf6467a167712eb838eb /tatsh-overlay.txt | |
| parent | 2023-11-06T06:45:01Z (diff) | |
| download | repos-ab20a26a99dce53db252f615bd40b8ae563f6431.tar.gz repos-ab20a26a99dce53db252f615bd40b8ae563f6431.tar.bz2 repos-ab20a26a99dce53db252f615bd40b8ae563f6431.zip | |
2023-11-06T07:00:01Z
Diffstat (limited to 'tatsh-overlay.txt')
| -rw-r--r-- | tatsh-overlay.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/tatsh-overlay.txt b/tatsh-overlay.txt index 225651625e9e..d6c99d3da8aa 100644 --- a/tatsh-overlay.txt +++ b/tatsh-overlay.txt @@ -15,29 +15,9 @@ pkgcore 0.12.21 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tatsh-overlay *** syncing tatsh-overlay -From https://github.com/Tatsh/tatsh-overlay - + 07d9d082...51ba91e8 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'... +Already up to date. *** synced tatsh-overlay - * 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 tatsh-overlay |