diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-12-19 14:03:16 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-12-19 14:03:16 +0000 |
| commit | 4544472c5fa2e83f3e8355df1a0d9e508a0733df (patch) | |
| tree | e6e2a5e5b86ec6245ddf7170f81f27885b07f001 /CachyOS-kernels.txt | |
| parent | 2024-12-19T13:45:00Z (diff) | |
| download | repos-4544472c5fa2e83f3e8355df1a0d9e508a0733df.tar.gz repos-4544472c5fa2e83f3e8355df1a0d9e508a0733df.tar.bz2 repos-4544472c5fa2e83f3e8355df1a0d9e508a0733df.zip | |
2024-12-19T14:00:00Z
Diffstat (limited to 'CachyOS-kernels.txt')
| -rw-r--r-- | CachyOS-kernels.txt | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/CachyOS-kernels.txt b/CachyOS-kernels.txt index 1bd842a6ca64..acf18f3a7c05 100644 --- a/CachyOS-kernels.txt +++ b/CachyOS-kernels.txt @@ -16,30 +16,9 @@ pkgcore 0.12.28 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync CachyOS-kernels *** syncing CachyOS-kernels -From https://github.com/Szowisz/CachyOS-kernels - + 027b875...72951fd main -> origin/main (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 CachyOS-kernels - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync CachyOS-kernels -*** syncing CachyOS-kernels -Cloning into '/var/lib/repo-mirror-ci/sync/CachyOS-kernels'... -Updating files: 66% (2107/3151)
Updating files: 67% (2112/3151)
Updating files: 68% (2143/3151)
Updating files: 69% (2175/3151)
Updating files: 70% (2206/3151)
Updating files: 71% (2238/3151)
Updating files: 72% (2269/3151)
Updating files: 73% (2301/3151)
Updating files: 74% (2332/3151)
Updating files: 75% (2364/3151)
Updating files: 76% (2395/3151)
Updating files: 77% (2427/3151)
Updating files: 78% (2458/3151)
Updating files: 79% (2490/3151)
Updating files: 80% (2521/3151)
Updating files: 81% (2553/3151)
Updating files: 82% (2584/3151)
Updating files: 83% (2616/3151)
Updating files: 84% (2647/3151)
Updating files: 85% (2679/3151)
Updating files: 86% (2710/3151)
Updating files: 87% (2742/3151)
Updating files: 88% (2773/3151)
Updating files: 89% (2805/3151)
Updating files: 90% (2836/3151)
Updating files: 91% (2868/3151)
Updating files: 92% (2899/3151)
Updating files: 93% (2931/3151)
Updating files: 94% (2962/3151)
Updating files: 95% (2994/3151)
Updating files: 96% (3025/3151)
Updating files: 97% (3057/3151)
Updating files: 98% (3088/3151)
Updating files: 99% (3120/3151)
Updating files: 100% (3151/3151)
Updating files: 100% (3151/3151), done. +Already up to date. *** synced CachyOS-kernels - * 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 CachyOS-kernels |