diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-06-23 03:48:51 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-06-23 03:48:51 +0000 |
| commit | aafa16121d487c3d30e37ccb03657811cad65d1c (patch) | |
| tree | 8b8307a26d3f76ab8bac165cba3a469dd4e8d72c /Case_Of.txt | |
| parent | 2024-06-23T03:30:00Z (diff) | |
| download | repos-aafa16121d487c3d30e37ccb03657811cad65d1c.tar.gz repos-aafa16121d487c3d30e37ccb03657811cad65d1c.tar.bz2 repos-aafa16121d487c3d30e37ccb03657811cad65d1c.zip | |
2024-06-23T03:45:00Z
Diffstat (limited to 'Case_Of.txt')
| -rw-r--r-- | Case_Of.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/Case_Of.txt b/Case_Of.txt index e636868555f4..b9bb1cd25579 100644 --- a/Case_Of.txt +++ b/Case_Of.txt @@ -14,29 +14,9 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync Case_Of *** syncing Case_Of -From https://codeberg.org/Case_Of/gentoo-overlay - + 1f9d6cb...6b4842d 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 -*** syncing Case_Of -Cloning into '/var/lib/repo-mirror-ci/sync/Case_Of'... +Already up to date. *** synced Case_Of - * 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 Case_Of |