diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-08-07 17:03:52 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-08-07 17:03:52 +0000 |
commit | c2f617f8407581690e8329a5c75780473d07e175 (patch) | |
tree | a007e3640ecf0a2d71a49b9316664bf48ae41f14 /robertgzr.txt | |
parent | 2024-08-07T16:45:00Z (diff) | |
download | repos-c2f617f8407581690e8329a5c75780473d07e175.tar.gz repos-c2f617f8407581690e8329a5c75780473d07e175.tar.bz2 repos-c2f617f8407581690e8329a5c75780473d07e175.zip |
2024-08-07T17:00:00Z
Diffstat (limited to 'robertgzr.txt')
-rw-r--r-- | robertgzr.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/robertgzr.txt b/robertgzr.txt index ebb51d998dd0..3e3e32573225 100644 --- a/robertgzr.txt +++ b/robertgzr.txt @@ -13,29 +13,9 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync robertgzr *** syncing robertgzr -From https://git.sr.ht/~robertgzr/portage - + 26a7417...db6c8c8 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 robertgzr - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync robertgzr -*** syncing robertgzr -Cloning into '/var/lib/repo-mirror-ci/sync/robertgzr'... +Already up to date. *** synced robertgzr - * 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 robertgzr |