diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-08-20 13:33:41 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-08-20 13:33:41 +0000 |
commit | 253a48ce074f9d530c196feb360df7474061b0c3 (patch) | |
tree | 0b440b121bb2dddf6db615413470d323633858e9 /AlexandreFournier.txt | |
parent | 2024-08-20T13:15:00Z (diff) | |
download | repos-253a48ce074f9d530c196feb360df7474061b0c3.tar.gz repos-253a48ce074f9d530c196feb360df7474061b0c3.tar.bz2 repos-253a48ce074f9d530c196feb360df7474061b0c3.zip |
2024-08-20T13:30:00Z
Diffstat (limited to 'AlexandreFournier.txt')
-rw-r--r-- | AlexandreFournier.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/AlexandreFournier.txt b/AlexandreFournier.txt index 2acc94a9657b..b24593d471a5 100644 --- a/AlexandreFournier.txt +++ b/AlexandreFournier.txt @@ -15,29 +15,9 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync AlexandreFournier *** syncing AlexandreFournier -From https://github.com/AlexandreFournier/gentoo-overlay - + 6c64f19...ae403c7 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 AlexandreFournier - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync AlexandreFournier -*** syncing AlexandreFournier -Cloning into '/var/lib/repo-mirror-ci/sync/AlexandreFournier'... +Already up to date. *** synced AlexandreFournier - * 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 AlexandreFournier |