diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2022-11-02 23:16:42 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-11-02 23:16:42 +0000 |
| commit | d9e2099be59008ff2081bb8abc746f9745456647 (patch) | |
| tree | e4d98bc39b9d2a4dc5ccf3b871dc242a939120ca /Case_Of.txt | |
| parent | 2022-11-02T23:00:01Z (diff) | |
| download | repos-d9e2099be59008ff2081bb8abc746f9745456647.tar.gz repos-d9e2099be59008ff2081bb8abc746f9745456647.tar.bz2 repos-d9e2099be59008ff2081bb8abc746f9745456647.zip | |
2022-11-02T23:15:01Z
Diffstat (limited to 'Case_Of.txt')
| -rw-r--r-- | Case_Of.txt | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/Case_Of.txt b/Case_Of.txt index a48638738b60..bc8f09cf123d 100644 --- a/Case_Of.txt +++ b/Case_Of.txt @@ -16,24 +16,29 @@ $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync Case_Of ERROR:pkgcore:Cannot write cache for /var/cache/pkgcore/plugincache: [Errno 13] Permission denied: '/var/cache/pkgcore/.update.plugincache'. Try running pplugincache. *** syncing Case_Of From https://codeberg.org/Case_Of/gentoo-overlay - 632cd8e..67baacb master -> origin/master -Updating 632cd8e..67baacb -Fast-forward - dev-util/cpp-utilities/Manifest | 2 +- - .../{cpp-utilities-5.19.0.ebuild => cpp-utilities-5.20.0.ebuild} | 0 - dev-util/qtforkawesome/Manifest | 2 +- - .../{qtforkawesome-0.0.4.ebuild => qtforkawesome-0.1.0.ebuild} | 0 - dev-util/qtutilities/Manifest | 2 +- - .../qtutilities/{qtutilities-6.9.0.ebuild => qtutilities-6.10.0.ebuild} | 0 - x11-plugins/syncthingtray/Manifest | 2 +- - .../{syncthingtray-1.2.4.ebuild => syncthingtray-1.3.0.ebuild} | 0 - 8 files changed, 4 insertions(+), 4 deletions(-) - rename dev-util/cpp-utilities/{cpp-utilities-5.19.0.ebuild => cpp-utilities-5.20.0.ebuild} (100%) - rename dev-util/qtforkawesome/{qtforkawesome-0.0.4.ebuild => qtforkawesome-0.1.0.ebuild} (100%) - rename dev-util/qtutilities/{qtutilities-6.9.0.ebuild => qtutilities-6.10.0.ebuild} (100%) - rename x11-plugins/syncthingtray/{syncthingtray-1.2.4.ebuild => syncthingtray-1.3.0.ebuild} (100%) + + 67baacb...360183c 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 Case_Of + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync Case_Of +ERROR:pkgcore:Cannot write cache for /var/cache/pkgcore/plugincache: [Errno 13] Permission denied: '/var/cache/pkgcore/.update.plugincache'. Try running pplugincache. +*** syncing Case_Of +Cloning into '/var/lib/repo-mirror-ci/sync/Case_Of'... *** synced Case_Of - * 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 Case_Of |